summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-12-16 15:23:54 -0800
committerDavid S. Miller <davem@davemloft.net>2008-12-16 15:23:54 -0800
commit354ade9058687fdef8a612c7b298d4c51dae3da7 (patch)
tree842cf24f53e8451058afa9a58a4ac7e54c7099be /include
parent9f690db7ff4cb32493c0b0b13334cc4f5fd49a6b (diff)
parentbb5f133dbc4f04b6388715d364ae5865455166c2 (diff)
downloadop-kernel-dev-354ade9058687fdef8a612c7b298d4c51dae3da7.zip
op-kernel-dev-354ade9058687fdef8a612c7b298d4c51dae3da7.tar.gz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/enc28j60.c
Diffstat (limited to 'include')
-rw-r--r--include/linux/netfilter/nfnetlink_conntrack.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/netfilter/nfnetlink_conntrack.h b/include/linux/netfilter/nfnetlink_conntrack.h
index c19595c..29fe9ea 100644
--- a/include/linux/netfilter/nfnetlink_conntrack.h
+++ b/include/linux/netfilter/nfnetlink_conntrack.h
@@ -141,6 +141,7 @@ enum ctattr_protonat {
#define CTA_PROTONAT_MAX (__CTA_PROTONAT_MAX - 1)
enum ctattr_natseq {
+ CTA_NAT_SEQ_UNSPEC,
CTA_NAT_SEQ_CORRECTION_POS,
CTA_NAT_SEQ_OFFSET_BEFORE,
CTA_NAT_SEQ_OFFSET_AFTER,
OpenPOWER on IntegriCloud