summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-04-17 01:32:29 +0200
committerDavid S. Miller <davem@davemloft.net>2009-04-17 01:32:29 +0200
commit134ffb4cad92a6aa534e55a9be145bca780a32c1 (patch)
treebe2b312eefbe4b38e81efb384fda4d8fdfae9943 /include/net
parentixgbe: Be explict with what we are !'ing in ixgbe_sfp_config_module_task() (diff)
parentnetfilter: nf_nat: add support for persistent mappings (diff)
downloadlinux-134ffb4cad92a6aa534e55a9be145bca780a32c1.tar.xz
linux-134ffb4cad92a6aa534e55a9be145bca780a32c1.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include/net')
-rw-r--r--include/net/netfilter/nf_nat.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/netfilter/nf_nat.h b/include/net/netfilter/nf_nat.h
index 9dc1039ff78b..8df0b7f7fc6e 100644
--- a/include/net/netfilter/nf_nat.h
+++ b/include/net/netfilter/nf_nat.h
@@ -18,6 +18,7 @@ enum nf_nat_manip_type
#define IP_NAT_RANGE_MAP_IPS 1
#define IP_NAT_RANGE_PROTO_SPECIFIED 2
#define IP_NAT_RANGE_PROTO_RANDOM 4
+#define IP_NAT_RANGE_PERSISTENT 8
/* NAT sequence number modifications */
struct nf_nat_seq {