diff options
| author |   David S. Miller <davem@davemloft.net> | 2012-03-07 22:27:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-07 22:27:56 -0800 |
| commit | c75a312d8b2c97943014261d71c6ef2622b6d0d9 (patch) | |
| tree | 374a25ac277d787485dc9acf87710e28f50d52bb /include/linux/netfilter/nfnetlink.h | |
| parent | tcp: md5: correct a RCU lockdep splat (diff) | |
| parent | netfilter: xt_LOG: add __printf() to sb_add() (diff) | |
| download | linux-dev-c75a312d8b2c97943014261d71c6ef2622b6d0d9.tar.xz linux-dev-c75a312d8b2c97943014261d71c6ef2622b6d0d9.zip | |
Merge branch 'master' of git://1984.lsi.us.es/net-next
Diffstat (limited to 'include/linux/netfilter/nfnetlink.h')
| -rw-r--r-- | include/linux/netfilter/nfnetlink.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h index b64454c2f79f..6fd1f0d07e64 100644 --- a/include/linux/netfilter/nfnetlink.h +++ b/include/linux/netfilter/nfnetlink.h @@ -49,7 +49,8 @@ struct nfgenmsg { #define NFNL_SUBSYS_OSF 5 #define NFNL_SUBSYS_IPSET 6 #define NFNL_SUBSYS_ACCT 7 -#define NFNL_SUBSYS_COUNT 8 +#define NFNL_SUBSYS_CTNETLINK_TIMEOUT 8 +#define NFNL_SUBSYS_COUNT 9 #ifdef __KERNEL__ |