diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-25 14:48:58 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-25 14:48:58 -0400 |
| commit | 80bb3a00fa314e3c5dbbd23a38bfaf94f2402b99 (patch) | |
| tree | ef2e5b4dde5ef7674b5cc713db9dc925d1f98f15 /include/linux | |
| parent | 9a127aad4d60968fba96622008ea0d243688f2b0 (diff) | |
| parent | 8f5992291457c8e6de2f5fe39849de6756be1a96 (diff) | |
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.h | 1 |
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 @@ | |||
| 59 | enum nf_ip6_hook_priorities { | 59 | enum nf_ip6_hook_priorities { |
| 60 | NF_IP6_PRI_FIRST = INT_MIN, | 60 | NF_IP6_PRI_FIRST = INT_MIN, |
| 61 | NF_IP6_PRI_CONNTRACK_DEFRAG = -400, | 61 | NF_IP6_PRI_CONNTRACK_DEFRAG = -400, |
| 62 | NF_IP6_PRI_RAW = -300, | ||
| 62 | NF_IP6_PRI_SELINUX_FIRST = -225, | 63 | NF_IP6_PRI_SELINUX_FIRST = -225, |
| 63 | NF_IP6_PRI_CONNTRACK = -200, | 64 | NF_IP6_PRI_CONNTRACK = -200, |
| 64 | NF_IP6_PRI_MANGLE = -150, | 65 | NF_IP6_PRI_MANGLE = -150, |