iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/net/ipv6
History
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
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
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
ipv6: use IS_ENABLED()
2012-11-01 12:41:35 -04:00
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
net: ipv6: fix error return code
2012-08-31 16:27:48 -04:00
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
ipv6: introduce ip6_rt_put()
2012-11-03 14:59:05 -04:00
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
ipv6: add support of equal cost multipath (ECMP)
2012-10-23 02:38:32 -04:00
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: Add redirect support to all protocol icmp error handlers.
2012-07-12 00:25:15 -07:00
ipv6_sockglue.c
net: Allow userns root to control ipv6
2012-11-18 20:32:45 -05:00
Kconfig
gre: Support GRE over IPv6
2012-08-14 14:28:32 -07:00
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
ipv6: mip6: fix mip6_mh_filter()
2012-09-25 16:04:44 -04:00
ndisc.c
ndisc: Use struct rd_msg for redirect message.
2013-01-06 21:08:38 -08:00
netfilter.c
netfilter: ipv6: expand skb head in ip6_route_me_harder after oif change
2012-08-30 03:00:15 +02:00
output_core.c
ipv6: Update ipv6 static library with newly needed functions
2012-11-15 17:39:23 -05:00
proc.c
net: ipv6: proc: Fix error handling
2012-08-14 14:45:07 -07:00
protocol.c
ipv6: Pull IPv6 GSO registration out of the module
2012-11-15 17:39:24 -05:00
raw.c
ipv6: use IS_ENABLED()
2012-11-01 12:41:35 -04:00
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
net: ipv6: Standardize prefixes for message logging
2012-05-16 01:01:03 -04:00
udp_impl.h
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
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
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
xfrm6_input.c
netfilter: ipv6: use NFPROTO values for NF_HOOK invocation
2010-03-25 16:00:49 +01:00
xfrm6_mode_beet.c
ipsec: be careful of non existing mac headers
2012-02-23 16:50:45 -05:00
xfrm6_mode_ro.c
…
xfrm6_mode_transport.c
…
xfrm6_mode_tunnel.c
ipsec: be careful of non existing mac headers
2012-02-23 16:50:45 -05:00
xfrm6_output.c
xfrm6: remove unneeded NULL check in __xfrm6_output()
2012-02-01 02:52:48 -05:00
xfrm6_policy.c
xfrm6: Remove commented out function call to xfrm6_input_fini
2012-11-16 08:07:56 +01:00
xfrm6_state.c
ipv6: use IS_ENABLED()
2012-11-01 12:41:35 -04:00
xfrm6_tunnel.c
ipv6 xfrm: Use ipv6_addr_hash() in xfrm6_tunnel_spi_hash_byaddr().
2013-01-13 20:17:14 -05:00