David S. Miller 4b87f92259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	Documentation/networking/ip-sysctl.txt
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

Both conflicts were simply overlapping context.

A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.

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

2013-01-15 15:05:59 -05:00

..

netfilter

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-01-15 15:05:59 -05:00

addrconf_core.c

…

addrconf.c

ipv6: use addrconf_get_prefix_route for prefix route lookup [v2]

2013-01-10 14:22:54 -08:00

addrlabel.c

net: Enable a userns root rtnl calls that are safe for unprivilged users

2012-11-18 20:33:36 -05:00

af_inet6.c

ipv6: Use FIELD_SIZEOF() in inet6_init().

2013-01-09 23:38:23 -08:00

ah6.c

…

anycast.c

ipv6: avoid taking locks at socket dismantle

2012-12-05 16:01:28 -05:00

datagram.c

ipv6: Use ipv6_get_dsfield() instead of ipv6_tclass().

2013-01-13 20:17:14 -05:00

esp6.c

…

exthdrs_core.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch

2012-11-30 12:01:30 -05:00

exthdrs_offload.c

ipv6: Pull IPv6 GSO registration out of the module

2012-11-15 17:39:24 -05:00

exthdrs.c

ipv6: Store Router Alert option in IP6CB directly.

2013-01-13 20:17:14 -05:00

fib6_rules.c

…

icmp.c

net: Enable some sysctls that are safe for the userns root

2012-11-18 20:33:00 -05:00

inet6_connection_sock.c

ipv6: fix inet6_csk_update_pmtu() return value

2012-11-20 15:16:15 -05:00

inet6_hashtables.c

net: move inet_dport/inet_num in sock_common

2012-11-30 15:02:56 -05:00

ip6_checksum.c

ipv6: move csum_ipv6_magic() and udp6_csum_init() into static library

2013-01-08 17:56:10 -08:00

ip6_fib.c

…

ip6_flowlabel.c

net: Allow userns root to control ipv6

2012-11-18 20:32:45 -05:00

ip6_gre.c

ipv6: Introduce ip6_flow_hdr() to fill version, tclass and flowlabel.

2013-01-13 20:17:13 -05:00

ip6_input.c

ipv6: Store Router Alert option in IP6CB directly.

2013-01-13 20:17:14 -05:00

ip6_offload.c

net: Remove code duplication between offload structures

2012-11-15 17:39:51 -05:00

ip6_offload.h

ipv6: Pull IPv6 GSO registration out of the module

2012-11-15 17:39:24 -05:00

ip6_output.c

ipv6: Introduce ip6_flow_hdr() to fill version, tclass and flowlabel.

2013-01-13 20:17:13 -05:00

ip6_tunnel.c

ipv6: Introduce ip6_flow_hdr() to fill version, tclass and flowlabel.

2013-01-13 20:17:13 -05:00

ip6mr.c

ip6mr: fix rtm_family of rtnl msg

2012-12-04 13:27:24 -05:00

ipcomp6.c

…

ipv6_sockglue.c

net: Allow userns root to control ipv6

2012-11-18 20:32:45 -05:00

Kconfig

…

Makefile

ipv6: move csum_ipv6_magic() and udp6_csum_init() into static library

2013-01-08 17:56:10 -08:00

mcast.c

ipv6: Make ipv6_is_mld() inline and use it from ip6_mc_input().

2013-01-13 20:17:14 -05:00

mip6.c

…

ndisc.c

ndisc: Use struct rd_msg for redirect message.

2013-01-06 21:08:38 -08:00

netfilter.c

…

output_core.c

ipv6: Update ipv6 static library with newly needed functions

2012-11-15 17:39:23 -05:00

proc.c

…

protocol.c

ipv6: Pull IPv6 GSO registration out of the module

2012-11-15 17:39:24 -05:00

raw.c

…

reassembly.c

net: Don't export sysctls to unprivileged users

2012-11-18 20:30:55 -05:00

route.c

ipv6 netevent: Remove old_neigh from netevent_redirect.

2013-01-14 15:04:59 -05:00

sit.c

ip6tnl/sit: drop packet if ECN present with not-ECT

2012-11-28 11:37:11 -05:00

syncookies.c

tcp: make sysctl_tcp_ecn namespace aware

2013-01-06 21:09:56 -08:00

sysctl_net_ipv6.c

net: Enable some sysctls that are safe for the userns root

2012-11-18 20:33:00 -05:00

tcp_ipv6.c

ipv6: Use ipv6_get_dsfield() instead of ipv6_tclass().

2013-01-13 20:17:14 -05:00

tcpv6_offload.c

net: Remove code duplication between offload structures

2012-11-15 17:39:51 -05:00

tunnel6.c

…

udp_impl.h

…

udp_offload.c

ipv6: Fix build error with udp_offload

2012-11-15 22:48:32 -05:00

udp.c

ipv6: move csum_ipv6_magic() and udp6_csum_init() into static library

2013-01-08 17:56:10 -08: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

xfrm6: Remove commented out function call to xfrm6_input_fini

2012-11-16 08:07:56 +01:00

xfrm6_state.c

…

xfrm6_tunnel.c

ipv6 xfrm: Use ipv6_addr_hash() in xfrm6_tunnel_spi_hash_byaddr().

2013-01-13 20:17:14 -05:00