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

net: remove redundant check for timer pending state before del_timer

2013-02-04 13:26:49 -05:00

af_inet.c

ipv4: Disallow non-namespace aware protocols to register.

2013-02-05 14:42:23 -05:00

ah4.c

xfrm4: Invalidate all ipv4 routes on IPsec pmtu events

2013-01-21 12:43:54 +01:00

arp.c

arp: fix possible crash in arp_rcv()

2013-02-10 20:39:39 -05:00

cipso_ipv4.c

cipso: don't follow a NULL pointer when setsockopt() is called

2012-07-18 09:01:12 -07:00

datagram.c

ipv4: Add a socket release callback for datagram sockets

2013-01-21 14:17:05 -05:00

devinet.c

ipv4: introduce address lifetime

2013-01-29 13:59:57 -05:00

esp4.c

xfrm4: Invalidate all ipv4 routes on IPsec pmtu events

2013-01-21 12:43:54 +01:00

fib_frontend.c

ipv4: fib: fix a comment.

2013-01-11 15:58:08 -08:00

fib_lookup.h

…

fib_rules.c

sections: fix section conflicts in net

2012-10-06 03:04:45 +09:00

fib_semantics.c

ipv4: 16 slots in initial fib_info hash table

2012-10-22 14:29:06 -04:00

fib_trie.c

ipv4/route: arg delay is useless in rt_cache_flush()

2012-09-18 15:44:34 -04:00

gre.c

net: ipv4: Standardize prefixes for message logging

2012-03-12 17:05:21 -07:00

icmp.c

ipv4: avoid passing NULL to inet_putpeer() in icmpv4_xrlim_allow()

2012-11-26 17:24:41 -05:00

igmp.c

igmp: export symbol ip_mc_leave_group

2012-10-01 18:39:44 -04:00

inet_connection_sock.c

soreuseport: fix use of uid in tb->fastuid

2013-01-27 01:01:42 -05:00

inet_diag.c

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

2012-12-12 18:07:07 -08:00

inet_fragment.c

net: frag, move LRU list maintenance outside of rwlock

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

inet_hashtables.c

soreuseport: TCP/IPv4 implementation

2013-01-23 13:44:01 -05:00

inet_lro.c

net: add skb frag size accessors

2011-10-19 03:10:46 -04:00

inet_timewait_sock.c

net: ipv4 and ipv6: Convert printk(KERN_DEBUG to pr_debug

2012-05-16 01:01:03 -04:00

inetpeer.c

Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

2012-10-02 09:54:49 -07:00

ip_forward.c

ipv4: introduce rt_uses_gateway

2012-10-08 17:42:36 -04:00

ip_fragment.c

net: frag, move LRU list maintenance outside of rwlock

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

ip_gre.c

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

2013-01-29 15:32:13 -05:00

ip_input.c

ipv4: Disallow non-namespace aware protocols to register.

2013-02-05 14:42:23 -05:00

ip_options.c

net: Allow userns root to control ipv4

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

ip_output.c

net: Handle encapsulated offloads before fragmentation or handing to lower dev

2012-12-09 00:20:28 -05:00

ip_sockglue.c

net: prevent setting ttl=0 via IP_TTL

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

ip_vti.c

net: Allow userns root to control ipv4

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

ipcomp.c

ipcomp: Mark as netns_ok.

2013-02-04 15:46:15 -05:00

ipconfig.c

net/ipv4/ipconfig: really display the BOOTP/DHCP server's address.

2013-01-04 15:14:14 -08:00

ipip.c

net: fix possible wrong checksum generation

2013-01-28 00:27:15 -05:00

ipmr.c

ipmr: fix sparse warning when testing origin or group

2013-01-22 14:24:29 -05:00

Kconfig

net/ipv4: VTI support new module for ip_vti.

2012-07-18 09:36:12 -07:00

Makefile

memcg: rename config variables

2012-07-31 18:42:43 -07:00

netfilter.c

netfilter: properly annotate ipv4_netfilter_{init,fini}()

2012-09-03 13:56:04 +02:00

ping.c

ipv4: Add a socket release callback for datagram sockets

2013-01-21 14:17:05 -05:00

proc.c

tcp: TCP Fast Open Server - header & support functions

2012-08-31 20:02:18 -04:00

protocol.c

ipv4: Disallow non-namespace aware protocols to register.

2013-02-05 14:42:23 -05:00

raw.c

ipv4: Add a socket release callback for datagram sockets

2013-01-21 14:17:05 -05:00

route.c

ipv4: Fix route refcount on pmtu discovery

2013-01-22 14:23:17 -05:00

syncookies.c

tcp: make sysctl_tcp_ecn namespace aware

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

sysctl_net_ipv4.c

tcp: remove Appropriate Byte Count support

2013-02-05 14:51:16 -05:00

tcp_bic.c

tcp: fix undo after RTO for BIC

2012-01-20 14:17:26 -05:00

tcp_cong.c

tcp: remove Appropriate Byte Count support

2013-02-05 14:51:16 -05:00

tcp_cubic.c

tcp: fix undo after RTO for CUBIC

2012-01-20 14:17:26 -05:00

tcp_diag.c

inet_diag: Rename inet_diag_req into inet_diag_req_v2

2012-01-11 12:56:06 -08:00

tcp_fastopen.c

tcp: TCP Fast Open Server - header & support functions

2012-08-31 20:02:18 -04:00

tcp_highspeed.c

…

tcp_htcp.c

…

tcp_hybla.c

tcp: bool conversions

2012-05-17 14:59:59 -04:00

tcp_illinois.c

net: fix divide by zero in tcp algorithm illinois

2012-11-01 11:55:59 -04:00

tcp_input.c

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

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

tcp_ipv4.c

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

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

tcp_lp.c

…

tcp_memcontrol.c

memcg: decrement static keys at real destroy time

2012-05-29 16:22:28 -07:00

tcp_metrics.c

tcp: handle tcp_net_metrics_init() order-5 memory allocation failures

2012-11-16 13:36:27 -05:00

tcp_minisocks.c

tcp: remove Appropriate Byte Count support

2013-02-05 14:51:16 -05:00

tcp_output.c

net: fix possible wrong checksum generation

2013-01-28 00:27:15 -05:00

tcp_probe.c

net: cleanup unsigned to unsigned int

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

tcp_scalable.c

…

tcp_timer.c

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

2012-11-10 18:32:51 -05:00

tcp_vegas.c

…

tcp_vegas.h

…

tcp_veno.c

…

tcp_westwood.c

…

tcp_yeah.c

…

tcp.c

tcp: remove Appropriate Byte Count support

2013-02-05 14:51:16 -05:00

tunnel4.c

net: Convert printks to pr_<level>

2012-03-11 23:42:51 -07:00

udp_diag.c

netlink: Rename pid to portid to avoid confusion

2012-09-10 15:30:41 -04:00

udp_impl.h

ipv4: fix checkpatch errors

2012-04-15 12:37:19 -04:00

udp.c

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

2013-01-29 15:32:13 -05:00

udplite.c

net: ipv4: Standardize prefixes for message logging

2012-03-12 17:05:21 -07:00

xfrm4_input.c

ipv4: Fix input route performance regression.

2012-07-26 15:50:39 -07:00

xfrm4_mode_beet.c

ipsec: be careful of non existing mac headers

2012-02-23 16:50:45 -05:00

xfrm4_mode_transport.c

…

xfrm4_mode_tunnel.c

net/ipv4: VTI support rx-path hook in xfrm4_mode_tunnel.

2012-07-18 09:36:12 -07:00

xfrm4_output.c

…

xfrm4_policy.c

xfrm: Fix the gc threshold value for ipv4

2012-11-13 09:15:07 +01:00

xfrm4_state.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

xfrm4_tunnel.c

net: ipv4: Standardize prefixes for message logging

2012-03-12 17:05:21 -07:00