diff options
author | David S. Miller <davem@davemloft.net> | 2012-11-16 17:42:43 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-11-16 17:42:43 (GMT) |
commit | 545b29019c8959c805abfe8194d47e989f1a6e5f (patch) | |
tree | 120f88abf0b4b2317072579c667fddfccb930fe5 /include/uapi | |
parent | 130cd273d4a46a3011b1cc739f5d2af78779d666 (diff) | |
parent | d3976a53ce1f4763cb910d047e8763e4c696e5f7 (diff) | |
download | linux-fsl-qoriq-545b29019c8959c805abfe8194d47e989f1a6e5f.tar.xz |
Merge branch 'master' of git://1984.lsi.us.es/nf-next
Conflicts:
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
Minor conflict due to some IS_ENABLED conversions done
in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
-rw-r--r-- | include/uapi/linux/in6.h | 1 | ||||
-rw-r--r-- | include/uapi/linux/netfilter_ipv6/ip6_tables.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/uapi/linux/in6.h b/include/uapi/linux/in6.h index 1e31599..f79c372 100644 --- a/include/uapi/linux/in6.h +++ b/include/uapi/linux/in6.h @@ -240,6 +240,7 @@ struct in6_flowlabel_req { * * IP6T_SO_GET_REVISION_MATCH 68 * IP6T_SO_GET_REVISION_TARGET 69 + * IP6T_SO_ORIGINAL_DST 80 */ /* RFC5014: Source address selection */ diff --git a/include/uapi/linux/netfilter_ipv6/ip6_tables.h b/include/uapi/linux/netfilter_ipv6/ip6_tables.h index bf1ef65..649c680 100644 --- a/include/uapi/linux/netfilter_ipv6/ip6_tables.h +++ b/include/uapi/linux/netfilter_ipv6/ip6_tables.h @@ -178,6 +178,9 @@ struct ip6t_error { #define IP6T_SO_GET_REVISION_TARGET (IP6T_BASE_CTL + 5) #define IP6T_SO_GET_MAX IP6T_SO_GET_REVISION_TARGET +/* obtain original address if REDIRECT'd connection */ +#define IP6T_SO_ORIGINAL_DST 80 + /* ICMP matching stuff */ struct ip6t_icmp { __u8 type; /* type to match */ |