From: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> Hi David, This is the second try to include the following four patches that contain updates for your net-next tree, they are: * Little cleanup for IPVS the use of a strange notation to assign the conntrack object, from Alan Cox. * Another little cleanup for nf_nat to save a couple of lines by using PTR_RET, from Wu Fengguan * getsockopt support to obtain the original IPv6 address after NAT, similar to the one that IPv4 provides, from Florian Westphal. * Follow-up patch pointed out by YOSHIFUJI Hideaki to only provide the scope_id in case that link is local, again from Florian Westphal. You can pull these changes from: git://1984.lsi.us.es/nf-next master Thanks! Alan Cox (1): ipvs: remove silly double assignment Florian Westphal (2): netfilter: ipv6: add getsockopt to retrieve origdst netfilter: ipv6: only provide sk_bound_dev_if for link-local addr Wu Fengguang (1): netfilter: nf_nat: use PTR_RET include/uapi/linux/in6.h | 1 + include/uapi/linux/netfilter_ipv6/ip6_tables.h | 3 ++ net/ipv4/netfilter/iptable_nat.c | 4 +- net/ipv6/netfilter/ip6table_nat.c | 4 +- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 66 ++++++++++++++++++++++++ net/netfilter/ipvs/ip_vs_nfct.c | 2 +- net/netfilter/ipvs/ip_vs_xmit.c | 8 +-- 7 files changed, 77 insertions(+), 11 deletions(-) -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
