David S. Miller 61c5923a2f Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf ... Pablo Neira Ayuso says: ==================== The following patchset contains Netfilter fixes for you net tree, mostly targeted to ipset, they are: * Fix ICMPv6 NAT due to wrong comparison, code instead of type, from Phil Oester. * Fix RCU race in conntrack extensions release path, from Michal Kubecek. * Fix missing inversion in the userspace ipset test command match if the nomatch option is specified, from Jozsef Kadlecsik. * Skip layer 4 protocol matching in ipset in case of IPv6 fragments, also from Jozsef Kadlecsik. * Fix sequence adjustment in nfnetlink_queue due to using the netlink skb instead of the network skb, from Gao feng. * Make sure we cannot swap of sets with different layer 3 family in ipset, from Jozsef Kadlecsik. * Fix possible bogus matching in ipset if hash sets with net elements are used, from Oliver Smith. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2013-09-17 20:22:53 -04:00
..
netfilter	netfilter: nf_nat_proto_icmpv6:: fix wrong comparison in icmpv6_manip_pkt	2013-09-13 11:58:48 +02:00
Kconfig	Tunneling: use IP Tunnel stats APIs.	2013-03-26 12:27:19 -04:00
Makefile	net: ipv6: Add IPv6 support to the ping socket.	2013-05-25 21:07:49 -07:00
addrconf.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-09-05 14:58:52 -04:00
addrconf_core.c	ipv6: move in6_dev_finish_destroy() into core kernel	2013-08-31 22:30:00 -04:00
addrlabel.c	ipv6: fix null pointer dereference in __ip6addrlbl_add	2013-09-04 14:14:53 -04:00
af_inet6.c	ipv6: don't call fib6_run_gc() until routing is ready	2013-09-11 17:04:09 -04:00
ah6.c	ipv6:introduce function to find route for redirect	2013-09-05 12:44:31 -04:00
anycast.c	…
datagram.c	net: proc_fs: trivial: print UIDs as unsigned int	2013-08-15 14:37:46 -07:00
esp6.c	ipv6:introduce function to find route for redirect	2013-09-05 12:44:31 -04:00
exthdrs.c	ipv6/exthdrs: accept tlv which includes only padding	2013-09-11 15:52:27 -04:00
exthdrs_core.c	ipv6: Correct comparisons and calculations using skb->tail and skb-transport_header	2013-05-28 23:49:07 -07:00
exthdrs_offload.c	…
fib6_rules.c	fib6_rules: fix indentation	2013-09-11 16:16:29 -04:00
icmp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-09-05 14:58:52 -04:00
inet6_connection_sock.c	ipv6: use newly introduced __ipv6_addr_needs_scope_id and ipv6_iface_scope_id	2013-03-08 12:29:22 -05:00
inet6_hashtables.c	…
ip6_checksum.c	…
ip6_fib.c	net: fib: fib6_add: fix potential NULL pointer dereference	2013-09-11 16:09:59 -04:00
ip6_flowlabel.c	ipv6 flowlabel: add __rcu annotations	2013-03-07 16:33:10 -05:00
ip6_gre.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-09-05 14:58:52 -04:00
ip6_icmp.c	ipv6: Kill ipv6 dependency of icmpv6_send().	2013-04-29 13:54:36 -04:00
ip6_input.c	net: add SNMP counters tracking incoming ECN bits	2013-08-08 22:24:59 -07:00
ip6_offload.c	ipv6: Add generic UDP Tunnel segmentation	2013-08-31 22:30:01 -04:00
ip6_offload.h	…
ip6_output.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-09-05 14:58:52 -04:00
ip6_tunnel.c	ip6_tunnels: raddr and laddr are inverted in nl msg	2013-09-16 21:36:12 -04:00
ip6mr.c	tunnels: harmonize cleanup done on skb on rx path	2013-09-04 00:27:26 -04:00
ipcomp6.c	ipv6:introduce function to find route for redirect	2013-09-05 12:44:31 -04:00
ipv6_sockglue.c	…
mcast.c	net: ipv6: mld: introduce mld_{gq, ifc, dad}_stop_timer functions	2013-09-04 14:53:21 -04:00
mip6.c	ipv6: Correct comparisons and calculations using skb->tail and skb-transport_header	2013-05-28 23:49:07 -07:00
ndisc.c	ipv6: don't call fib6_run_gc() until routing is ready	2013-09-11 17:04:09 -04:00
netfilter.c	netfilter: add nf_ipv6_ops hook to fix xt_addrtype with IPv6	2013-05-23 11:58:55 +02:00
output_core.c	ipv6: move ip6_local_out into core kernel	2013-08-31 22:30:00 -04:00
ping.c	net: ipv6: fix wrong ping_v6_sendmsg return value	2013-07-03 17:42:05 -07:00
proc.c	net: add SNMP counters tracking incoming ECN bits	2013-08-08 22:24:59 -07:00
protocol.c	…
raw.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-09-05 14:58:52 -04:00
reassembly.c	ipv6: drop packets with multiple fragmentation headers	2013-08-20 00:11:24 -07:00
route.c	ipv6:introduce function to find route for redirect	2013-09-05 12:44:31 -04:00
sit.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-09-05 14:58:52 -04:00
syncookies.c	net: syncookies: export cookie_v6_init_sequence/cookie_v6_check	2013-08-28 00:28:04 +02:00
sysctl_net_ipv6.c	net: Convert uses of typedef ctl_table to struct ctl_table	2013-06-13 02:36:09 -07:00
tcp_ipv6.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-09-05 14:58:52 -04:00
tcpv6_offload.c	…
tunnel6.c	…
udp.c	net: rename ll methods to busy-poll	2013-07-10 17:08:27 -07:00
udp_impl.h	ipv6: do not clear pinet6 field	2013-05-11 16:26:38 -07:00
udp_offload.c	net: unify skb_udp_tunnel_segment() and skb_udp6_tunnel_segment()	2013-08-31 22:30:01 -04:00
udplite.c	ipv6: do not clear pinet6 field	2013-05-11 16:26:38 -07:00
xfrm6_input.c	…
xfrm6_mode_beet.c	…
xfrm6_mode_ro.c	…
xfrm6_mode_transport.c	…
xfrm6_mode_tunnel.c	xfrm: allow to avoid copying DSCP during encapsulation	2013-03-06 07:02:45 +01:00
xfrm6_output.c	xfrm: revert ipv4 mtu determination to dst_mtu	2013-08-26 12:40:53 +02:00
xfrm6_policy.c	xfrm6: release dev before returning error	2013-05-11 17:40:15 -07:00
xfrm6_state.c	xfrm: make local error reporting more robust	2013-08-14 13:07:12 +02:00
xfrm6_tunnel.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00