← Back to branch summary

~ubuntu-branches/debian/experimental/linux-tools/experimental

« back to all changes in this revision

Viewing changes to include/linux/netfilter/ipset/ip_set_timeout.h

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings
  • Date: 2014-02-02 16:57:49 UTC
  • mfrom: (1.1.10) (0.1.21 sid)
  • Revision ID: package-import@ubuntu.com-20140202165749-tw94o9t1t0a8txk6
Tags: 3.13-1~exp2
Merge changes from sid up to 3.12.6-3

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/linux/netfilter/ipset/ip_set_timeout.h
23
23
/* Set is defined with timeout support: timeout value may be 0 */
24
24
#define IPSET_NO_TIMEOUT        UINT_MAX
25
25
 
26
 
#define ip_set_adt_opt_timeout(opt, map)        \
27
 
((opt)->ext.timeout != IPSET_NO_TIMEOUT ? (opt)->ext.timeout : (map)->timeout)
 
26
#define ip_set_adt_opt_timeout(opt, set)        \
 
27
((opt)->ext.timeout != IPSET_NO_TIMEOUT ? (opt)->ext.timeout : (set)->timeout)
28
28
 
29
29
static inline unsigned int
30
30
ip_set_timeout_uget(struct nlattr *tb)