David S. Miller 3a07bd6fea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/mellanox/mlx4/main.c
	net/packet/af_packet.c

Both conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2015-06-24 02:58:51 -07:00

..

netfilter

netfilter: x_tables: remove XT_TABLE_INFO_SZ and a dereference.

2015-06-15 20:19:20 +02:00

addrconf_core.c

ipv6: fix possible use after free of dev stats

2015-06-08 12:12:45 -07:00

addrconf.c

…

addrlabel.c

…

af_inet6.c

inet: add IP_BIND_ADDRESS_NO_PORT to overcome bind(0) limitations

2015-06-06 23:57:12 -07:00

ah6.c

…

anycast.c

…

datagram.c

ip: report the original address of ICMP messages

2015-06-24 00:48:08 -07:00

esp6.c

esp6: Use high-order sequence number bits for IV generation

2015-05-13 09:34:54 +02:00

exthdrs_core.c

…

exthdrs_offload.c

…

exthdrs.c

…

fib6_rules.c

…

icmp.c

ipv6: Remove external dependency on rt6i_gateway and RTF_ANYCAST

2015-05-25 13:25:33 -04:00

inet6_connection_sock.c

…

inet6_hashtables.c

tcp: connect() from bound sockets can be faster

2015-05-27 14:30:10 -04:00

ip6_checksum.c

…

ip6_fib.c

ipv6: Create percpu rt6_info

2015-05-25 13:25:35 -04:00

ip6_flowlabel.c

…

ip6_gre.c

…

ip6_icmp.c

…

ip6_input.c

Revert "ipv6: Fix protocol resubmission"

2015-06-10 15:29:31 -07:00

ip6_offload.c

…

ip6_offload.h

…

ip6_output.c

ipv6: don't increase size when refragmenting forwarded ipv6 skbs

2015-05-25 17:22:23 -04:00

ip6_tunnel.c

ipv6: Add rt6_get_cookie() function

2015-05-25 13:25:34 -04:00

ip6_udp_tunnel.c

net: Modify sk_alloc to not reference count the netns of kernel sockets.

2015-05-11 10:50:18 -04:00

ip6_vti.c

vti6: Add pmtu handling to vti6_xmit.

2015-06-01 16:03:43 -07:00

ip6mr.c

…

ipcomp6.c

…

ipv6_sockglue.c

…

Kconfig

…

Makefile

…

mcast_snoop.c

…

mcast.c

…

mip6.c

…

ndisc.c

ipv6: Remove external dependency on rt6i_dst and rt6i_src

2015-05-25 13:25:32 -04:00

netfilter.c

netfilter: bridge: forward IPv6 fragmented packets

2015-06-12 14:10:12 +02:00

output_core.c

netfilter: don't pull include/linux/netfilter.h from netns headers

2015-06-18 21:14:31 +02:00

ping.c

…

proc.c

…

protocol.c

…

raw.c

ipv6: drop unneeded goto

2015-05-30 23:48:36 -07:00

reassembly.c

…

route.c

ipv6: Create percpu rt6_info

2015-05-25 13:25:35 -04:00

sit.c

…

syncookies.c

tcp: get_cookie_sock() consolidation

2015-06-07 15:19:52 -07:00

sysctl_net_ipv6.c

…

tcp_ipv6.c

tcp: tcp_v6_connect() cleanup

2015-06-12 21:59:25 -07:00

tcpv6_offload.c

…

tunnel6.c

…

udp_impl.h

…

udp_offload.c

…

udp.c

udp: fix behavior of wrong checksums

2015-05-31 21:42:18 -07:00

udplite.c

…

xfrm6_input.c

…

xfrm6_mode_beet.c

…

xfrm6_mode_ro.c

…

xfrm6_mode_transport.c

…

xfrm6_mode_tunnel.c

…

xfrm6_output.c

…

xfrm6_policy.c

ipv6: Add rt6_get_cookie() function

2015-05-25 13:25:34 -04:00

xfrm6_protocol.c

…

xfrm6_state.c

…

xfrm6_tunnel.c

…