summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-03-25 11:48:58 -0700
committerDavid S. Miller <davem@davemloft.net>2010-03-25 11:48:58 -0700
commit80bb3a00fa314e3c5dbbd23a38bfaf94f2402b99 (patch)
treeef2e5b4dde5ef7674b5cc713db9dc925d1f98f15 /include/linux
parent9a127aad4d60968fba96622008ea0d243688f2b0 (diff)
parent8f5992291457c8e6de2f5fe39849de6756be1a96 (diff)
downloadlinux-80bb3a00fa314e3c5dbbd23a38bfaf94f2402b99.tar.gz
linux-80bb3a00fa314e3c5dbbd23a38bfaf94f2402b99.tar.bz2
linux-80bb3a00fa314e3c5dbbd23a38bfaf94f2402b99.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/netfilter_ipv6.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h
index d654873aa25a..1f7e300094cd 100644
--- a/include/linux/netfilter_ipv6.h
+++ b/include/linux/netfilter_ipv6.h
@@ -59,6 +59,7 @@
enum nf_ip6_hook_priorities {
NF_IP6_PRI_FIRST = INT_MIN,
NF_IP6_PRI_CONNTRACK_DEFRAG = -400,
+ NF_IP6_PRI_RAW = -300,
NF_IP6_PRI_SELINUX_FIRST = -225,
NF_IP6_PRI_CONNTRACK = -200,
NF_IP6_PRI_MANGLE = -150,