David S. Miller 9f6d98c298 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

The bnx2x gso_type setting bug fix in 'net' conflicted with
changes in 'net-next' that broke the gso_* setting logic
out into a seperate function, which also fixes the bug in
question.  Thus, use the 'net-next' version.

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

2013-02-12 18:58:28 -05:00

..

netfilter

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

2013-02-12 18:58:28 -05:00

addrconf_core.c

net: cleanup unsigned to unsigned int

2012-04-15 12:44:40 -04:00

addrconf.c

ipv6: by default join ff01::1 and in case of forwarding ff01::2 and ff05:2

2013-02-11 14:16:26 -05: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

ah6/esp6: set transport header correctly for IPsec tunnel mode.

2013-01-08 12:41:30 +01:00

anycast.c

ipv6 anycast: Convert ipv6_sk_ac_lock to spinlock.

2013-01-30 22:41:13 -05:00

datagram.c

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

2013-02-05 14:12:20 -05:00

esp6.c

ah6/esp6: set transport header correctly for IPsec tunnel mode.

2013-01-08 12:41:30 +01: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

ipv6: Add an error handler for icmp6

2013-01-18 14:19:42 -05:00

inet6_connection_sock.c

ipv6: Fix inet6_csk_bind_conflict so it builds with user namespaces enabled

2013-01-29 15:20:12 -05:00

inet6_hashtables.c

soreuseport: TCP/IPv6 implementation

2013-01-23 13:44:01 -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

ipv6: fix a RCU warning in net/ipv6/ip6_flowlabel.c

2013-02-08 17:55:48 -05:00

ip6_gre.c

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

2013-02-08 18:02:14 -05:00

ip6_input.c

ipv6: don't accept multicast traffic with scope 0

2013-02-11 14:00:54 -05:00

ip6_offload.c

net: fix possible wrong checksum generation

2013-01-28 00:27:15 -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: don't let node/interface scoped multicast traffic escape on the wire

2013-02-11 14:00:54 -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

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

2013-01-29 15:32:13 -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

ipv6: rename datagram_send_ctl and datagram_recv_ctl

2013-01-31 13:53:08 -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 mcast: Do not join device multicast for interface-local multicasts.

2013-02-11 00:21:44 -05:00

mip6.c

ipv6: mip6: fix mip6_mh_filter()

2012-09-25 16:04:44 -04:00

ndisc.c

ndisc: Use compound literals to build redirect message.

2013-01-21 13:33:18 -05: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: rename datagram_send_ctl and datagram_recv_ctl

2013-01-31 13:53:08 -05:00

reassembly.c

net: frag, move LRU list maintenance outside of rwlock

2013-01-29 13:36:24 -05:00

route.c

ipv6: do not create neighbor entries for local delivery

2013-01-30 20:26:07 -05:00

sit.c

ipv6: add anti-spoofing checks for 6to4 and 6rd

2013-01-29 15:22:03 -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

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

2013-02-05 14:12:20 -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

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

2013-02-05 14:12:20 -05: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

ipv6: Complete neighbour entry removal from dst_entry.

2013-01-17 18:38:19 -05:00

xfrm6_state.c

ipv6: use IS_ENABLED()

2012-11-01 12:41:35 -04:00

xfrm6_tunnel.c

xfrm: Use ipv6_addr_equal() where appropriate.

2013-01-29 22:58:40 -05:00