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

Conflicts:
	net/bridge/br_mdb.c

Minor conflict in br_mdb.c, in 'net' we added a memset of the
on-stack 'ip' variable whereas in 'net-next' we assign a new
member 'vid'.

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

2015-07-13 17:28:09 -07:00

..

netfilter

netfilter: arptables: use percpu jumpstack

2015-07-02 17:58:59 +02:00

af_inet.c

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

2015-06-24 02:58:51 -07:00

ah4.c

…

arp.c

netfilter: Pass socket pointer down through okfn().

2015-04-07 15:25:55 -04:00

cipso_ipv4.c

ipv4: coding style: comparison for inequality with NULL

2015-04-03 12:11:15 -04:00

datagram.c

…

devinet.c

ipv4: add support for linkdown sysctl to netconf

2015-07-08 23:34:53 -07:00

esp4.c

esp4: Switch to new AEAD interface

2015-05-28 11:23:20 +08:00

fib_frontend.c

net: ipv4 sysctl option to ignore routes when nexthop link is down

2015-06-24 02:15:54 -07:00

fib_lookup.h

…

fib_rules.c

net: ipv4 sysctl option to ignore routes when nexthop link is down

2015-06-24 02:15:54 -07:00

fib_semantics.c

ipv4: fix RCU lockdep warning from linkdown changes

2015-06-28 16:47:12 -07:00

fib_trie.c

net: ipv4 sysctl option to ignore routes when nexthop link is down

2015-06-24 02:15:54 -07:00

fou.c

fou: avoid missing unlock in failure path

2015-04-16 12:11:19 -04:00

geneve_core.c

geneve_core: identify as driver library in modules description

2015-05-13 15:59:13 -04:00

gre_demux.c

…

gre_offload.c

ipv4: coding style: comparison for inequality with NULL

2015-04-03 12:11:15 -04:00

icmp.c

…

igmp.c

net: Export IGMP/MLD message validation code

2015-05-04 14:49:23 -04:00

inet_connection_sock.c

tcp: improve REUSEADDR/NOREUSEADDR cohabitation

2015-05-21 18:55:32 -04:00

inet_diag.c

net: inet_diag: always export IPV6_V6ONLY sockopt for listening sockets

2015-07-10 23:25:24 -07:00

inet_fragment.c

…

inet_hashtables.c

inet: inet_twsk_deschedule factorization

2015-07-09 15:12:20 -07:00

inet_lro.c

…

inet_timewait_sock.c

inet: inet_twsk_deschedule factorization

2015-07-09 15:12:20 -07:00

inetpeer.c

…

ip_forward.c

ip: reject too-big defragmented DF-skb when forwarding

2015-05-25 00:08:48 -04:00

ip_fragment.c

Revert "ipv4: use skb coalescing in defragmentation"

2015-07-11 21:16:40 -07:00

ip_gre.c

…

ip_input.c

netfilter: Pass socket pointer down through okfn().

2015-04-07 15:25:55 -04:00

ip_options.c

ipv4: coding style: comparison for inequality with NULL

2015-04-03 12:11:15 -04:00

ip_output.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

2015-06-15 14:30:32 -07:00

ip_sockglue.c

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

2015-06-24 02:58:51 -07:00

ip_tunnel_core.c

ip_tunnel: Report Rx dropped in ip_tunnel_get_stats64

2015-05-14 22:30:54 -04:00

ip_tunnel.c

ip_tunnel: fix ipv4 pmtu check to honor inner ip header df

2015-07-08 16:03:09 -07:00

ip_vti.c

ip_vti/ip6_vti: Preserve skb->mark after rcv_cb call

2015-05-28 06:23:32 +02:00

ipcomp.c

…

ipconfig.c

…

ipip.c

ipip: fix one sparse error

2015-05-17 13:08:29 -04:00

ipmr.c

netfilter: Pass socket pointer down through okfn().

2015-04-07 15:25:55 -04:00

Kconfig

tcp: add CDG congestion control

2015-06-11 00:09:12 -07:00

Makefile

tcp: add CDG congestion control

2015-06-11 00:09:12 -07:00

netfilter.c

netfilter: don't use module_init/exit in core IPV4 code

2015-06-16 14:12:34 -04:00

ping.c

ipv6: Nonlocal bind

2015-07-09 21:09:10 -07:00

proc.c

tcp: add TCPWinProbe and TCPKeepAlive SNMP counters

2015-05-09 16:42:32 -04:00

protocol.c

…

raw.c

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2015-04-13 18:18:05 -04:00

route.c

route: remove unsed variable in __mkroute_input

2015-07-09 21:34:34 -07:00

syncookies.c

tcp: get_cookie_sock() consolidation

2015-06-07 15:19:52 -07:00

sysctl_net_ipv4.c

net: limit tcp/udp rmem/wmem to SOCK_{RCV,SND}BUF_MIN

2015-05-30 17:37:44 -07:00

tcp_bic.c

tcp: add tcp_in_slow_start helper

2015-07-09 14:22:52 -07:00

tcp_cdg.c

tcp: do not slow start when cwnd equals ssthresh

2015-07-09 14:22:52 -07:00

tcp_cong.c

tcp: do not slow start when cwnd equals ssthresh

2015-07-09 14:22:52 -07:00

tcp_cubic.c

tcp: add tcp_in_slow_start helper

2015-07-09 14:22:52 -07:00

tcp_dctcp.c

net: tcp: dctcp_update_alpha() fixes.

2015-06-10 23:28:33 -07:00

tcp_diag.c

sock_diag: implement a get_info handler for inet

2015-06-15 19:49:22 -07:00

tcp_fastopen.c

tcp: Do not call tcp_fastopen_reset_cipher from interrupt context

2015-06-23 02:38:10 -07:00

tcp_highspeed.c

tcp: add tcp_in_slow_start helper

2015-07-09 14:22:52 -07:00

tcp_htcp.c

tcp: add tcp_in_slow_start helper

2015-07-09 14:22:52 -07:00

tcp_hybla.c

tcp: do not slow start when cwnd equals ssthresh

2015-07-09 14:22:52 -07:00

tcp_illinois.c

tcp: add tcp_in_slow_start helper

2015-07-09 14:22:52 -07:00

tcp_input.c

tcp: update congestion state first before raising cwnd

2015-07-09 14:22:52 -07:00

tcp_ipv4.c

inet: inet_twsk_deschedule factorization

2015-07-09 15:12:20 -07:00

tcp_lp.c

…

tcp_memcontrol.c

…

tcp_metrics.c

tcp: add tcp_in_slow_start helper

2015-07-09 14:22:52 -07:00

tcp_minisocks.c

inet: inet_twsk_deschedule factorization

2015-07-09 15:12:20 -07:00

tcp_offload.c

tcp: reserve tcp_skb_mss() to tcp stack

2015-06-11 16:33:10 -07:00

tcp_output.c

tcp: v1 always send a quick ack when quickacks are enabled

2015-07-09 14:15:44 -07:00

tcp_probe.c

…

tcp_scalable.c

tcp: add tcp_in_slow_start helper

2015-07-09 14:22:52 -07:00

tcp_timer.c

tcp: do not export tcp_init_xmit_timers()

2015-07-09 21:44:38 -07:00

tcp_vegas.c

tcp: add tcp_in_slow_start helper

2015-07-09 14:22:52 -07:00

tcp_vegas.h

tcp: prepare CC get_info() access from getsockopt()

2015-04-29 17:10:38 -04:00

tcp_veno.c

tcp: add tcp_in_slow_start helper

2015-07-09 14:22:52 -07:00

tcp_westwood.c

tcp_westwood: fix tcp_westwood_info()

2015-05-05 19:50:09 -04:00

tcp_yeah.c

…

tcp.c

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

2015-06-24 02:58:51 -07:00

tunnel4.c

…

udp_diag.c

sock_diag: specify info_size per inet protocol

2015-06-15 19:49:22 -07:00

udp_impl.h

…

udp_offload.c

ipv4: coding style: comparison for inequality with NULL

2015-04-03 12:11:15 -04:00

udp_tunnel.c

net: Modify sk_alloc to not reference count the netns of kernel sockets.

2015-05-11 10:50:18 -04:00

udp.c

ipv4/udp: Verify multicast group is ours in upd_v4_early_demux()

2015-06-04 00:46:26 -07:00

udplite.c

…

xfrm4_input.c

netfilter: Pass socket pointer down through okfn().

2015-04-07 15:25:55 -04:00

xfrm4_mode_beet.c

…

xfrm4_mode_transport.c

…

xfrm4_mode_tunnel.c

…

xfrm4_output.c

netfilter: Pass socket pointer down through okfn().

2015-04-07 15:25:55 -04:00

xfrm4_policy.c

…

xfrm4_protocol.c

…

xfrm4_state.c

…

xfrm4_tunnel.c

…