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

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

Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net.  Based upon a conflict resolution
patch posted by Stephen Rothwell.

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

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

..

netfilter

netfilter: nf_nat: don't check for port change on ICMP tuples

2012-10-28 22:43:34 +01:00

af_inet.c

ipv4: Don't add TCP-code in inet_sock_destruct

2012-09-20 17:12:27 -04:00

ah4.c

ipv4: Add redirect support to all protocol icmp error handlers.

2012-07-11 21:27:49 -07:00

arp.c

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

2012-09-18 15:44:34 -04: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

…

devinet.c

rtnl/ipv4: use netconf msg to advertise rp_filter status

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

esp4.c

ipv4: Add redirect support to all protocol icmp error handlers.

2012-07-11 21:27:49 -07:00

fib_frontend.c

ipv4: fix sending of redirects

2012-10-08 17:42:35 -04: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

…

icmp.c

ipv4: Prepare for change of rt->rt_iif encoding.

2012-07-23 16:36:26 -07:00

igmp.c

igmp: export symbol ip_mc_leave_group

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

inet_connection_sock.c

tcp: better retrans tracking for defer-accept

2012-11-03 14:45:00 -04:00

inet_diag.c

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

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

inet_fragment.c

ipv6: unify fragment thresh handling code

2012-09-19 17:23:28 -04:00

inet_hashtables.c

…

inet_lro.c

…

inet_timewait_sock.c

…

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

ipv6: unify fragment thresh handling code

2012-09-19 17:23:28 -04:00

ip_gre.c

gre: fix sparse warning

2012-10-01 17:35:31 -04:00

ip_input.c

net: TCP early demux cleanup

2012-07-30 14:53:21 -07:00

ip_options.c

ipv4: optimize fib_compute_spec_dst call in ip_options_echo

2012-07-19 08:30:49 -07:00

ip_output.c

ipv4: introduce rt_uses_gateway

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

ip_sockglue.c

ipv4: Prepare for change of rt->rt_iif encoding.

2012-07-23 16:36:26 -07:00

ip_vti.c

vti: fix sparse bit endian warnings

2012-10-12 13:56:52 -04:00

ipcomp.c

ipv4: Add redirect support to all protocol icmp error handlers.

2012-07-11 21:27:49 -07:00

ipconfig.c

net/ipv4/ipconfig: add device address to a KERN_INFO message

2012-10-31 13:23:00 -04:00

ipip.c

ipip: advertise tunnel param via rtnl

2012-11-09 19:36:20 -05:00

ipmr.c

sections: fix section conflicts in net

2012-10-06 03:04:45 +09: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

userns: Use kgids for sysctl_ping_group_range

2012-08-14 21:49:10 -07:00

proc.c

tcp: TCP Fast Open Server - header & support functions

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

protocol.c

…

raw.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2012-10-02 11:11:09 -07:00

route.c

ipv4: Fix flushing of cached routing informations

2012-10-18 15:34:30 -04:00

syncookies.c

tcp: better retrans tracking for defer-accept

2012-11-03 14:45:00 -04:00

sysctl_net_ipv4.c

tcp: sysctl interface leaks 16 bytes of kernel memory

2012-10-11 15:12:33 -04:00

tcp_bic.c

…

tcp_cong.c

tcp: Apply device TSO segment limit earlier

2012-08-02 00:19:17 -07:00

tcp_cubic.c

…

tcp_diag.c

…

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_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

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

tcp_ipv4.c

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

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

tcp_lp.c

…

tcp_memcontrol.c

…

tcp_metrics.c

tcp: Fix double sizeof in new tcp_metrics code

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

tcp_minisocks.c

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

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

tcp_output.c

tcp: use PRR to reduce cwin in CWR state

2012-09-03 14:34:02 -04:00

tcp_probe.c

…

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

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

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

tunnel4.c

…

udp_diag.c

netlink: Rename pid to portid to avoid confusion

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

udp_impl.h

…

udp.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2012-10-02 11:11:09 -07:00

udplite.c

…

xfrm4_input.c

ipv4: Fix input route performance regression.

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

xfrm4_mode_beet.c

…

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

ipv4: introduce rt_uses_gateway

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

xfrm4_state.c

…

xfrm4_tunnel.c

…