David S. Miller f6d3125fa3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/dsa/slave.c net/dsa/slave.c simply had overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-02 07:21:25 -07:00
..
netfilter	ipv4: Pass struct net into ip_route_me_harder	2015-09-29 20:21:32 +02:00
af_inet.c	net: Replace vrf_dev_table and friends	2015-09-29 20:40:33 -07:00
ah4.c	ah4: Fix error return in ah_input().	2015-08-25 13:38:50 -07:00
arp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-09-26 16:08:27 -07:00
cipso_ipv4.c	ipv4: coding style: comparison for inequality with NULL	2015-04-03 12:11:15 -04:00
datagram.c	net: Set sk_txhash from a random number	2015-07-29 22:44:04 -07:00
devinet.c	rtnetlink: RTEXT_FILTER_SKIP_STATS support to avoid dumping inet/inet6 stats	2015-09-15 15:25:02 -07:00
esp4.c	esp4: Switch to new AEAD interface	2015-05-28 11:23:20 +08:00
fib_frontend.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-02 07:21:25 -07:00
fib_lookup.h	ipv4: consider TOS in fib_select_default	2015-07-24 22:46:11 -07:00
fib_rules.c	net: ipv6: use common fib_default_rule_pref	2015-09-09 14:19:50 -07:00
fib_semantics.c	net: Make table id type u32	2015-09-01 14:32:44 -07:00
fib_trie.c	net: Fix vti use case with oif in dst lookups	2015-09-17 16:36:34 -07:00
fou.c	fou: reject IPv6 config	2015-08-29 13:07:54 -07:00
gre_demux.c	gre: Remove support for sharing GRE protocol hook.	2015-08-10 14:03:54 -07:00
gre_offload.c	ipv4: coding style: comparison for inequality with NULL	2015-04-03 12:11:15 -04:00
icmp.c	net: Replace vrf_master_ifindex{, _rcu} with l3mdev equivalents	2015-09-29 20:40:33 -07:00
igmp.c	net/ipv4: Pass proto as u8 instead of u16 in ip_check_mc_rcu	2015-09-29 16:27:47 -07:00
inet_connection_sock.c	tcp: prepare fastopen code for upcoming listener changes	2015-09-29 16:53:10 -07: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: frags: remove INET_FRAG_EVICTED and use list_evictor for the test	2015-07-26 21:00:15 -07:00
inet_hashtables.c	inet: constify __inet_inherit_port() sock argument	2015-09-29 16:53:08 -07:00
inet_lro.c	lro: remove dead code	2013-12-29 16:34:25 -05:00
inet_timewait_sock.c	tcp/dccp: fix timewait races in timer handling	2015-09-21 16:32:29 -07:00
inetpeer.c	net: Add helper function to compare inetpeer addresses	2015-08-28 13:32:36 -07:00
ip_forward.c	netfilter: Pass net into okfn	2015-09-17 17:18:37 -07:00
ip_fragment.c	net: Replace vrf_master_ifindex{, _rcu} with l3mdev equivalents	2015-09-29 20:40:33 -07:00
ip_gre.c	ip_tunnels: record IP version in tunnel info	2015-08-29 13:07:54 -07:00
ip_input.c	netfilter: Pass net into okfn	2015-09-17 17:18:37 -07:00
ip_options.c	ipv4: coding style: comparison for inequality with NULL	2015-04-03 12:11:15 -04:00
ip_output.c	net: Rename IFF_VRF_MASTER to IFF_L3MDEV_MASTER	2015-09-29 20:40: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	lwtunnel: remove source and destination UDP port config option	2015-09-24 14:31:37 -07:00
ip_tunnel.c	ip_gre: Add support to collect tunnel metadata.	2015-08-10 14:03:54 -07:00
ip_vti.c	net: Merge dst_output and dst_output_sk	2015-09-17 17:18:32 -07:00
ipcomp.c	ipv4: coding style: comparison for equality with NULL	2015-04-03 12:11:15 -04:00
ipconfig.c	net: ipv4: increase dhcp inter device timeout	2015-08-12 16:40:22 -07:00
ipip.c	ip_gre: Add support to collect tunnel metadata.	2015-08-10 14:03:54 -07:00
ipmr.c	netfilter: Pass net into okfn	2015-09-17 17:18:37 -07:00
Kconfig	geneve: Consolidate Geneve functionality in single module.	2015-08-27 15:42:48 -07:00
Makefile	geneve: Consolidate Geneve functionality in single module.	2015-08-27 15:42:48 -07:00
netfilter.c	ipv4: Pass struct net into ip_route_me_harder	2015-09-29 20:21:32 +02:00
ping.c	ipv6: Nonlocal bind	2015-07-09 21:09:10 -07:00
proc.c	net: track success and failure of TCP PMTU probing	2015-07-21 22:36:33 -07:00
protocol.c	net: Export inet_offloads and inet6_offloads	2014-09-19 17:15:31 -04:00
raw.c	netfilter: Pass net into okfn	2015-09-17 17:18:37 -07:00
route.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-02 07:21:25 -07:00
syncookies.c	tcp: cookie_init_sequence() cleanups	2015-09-29 16:53:09 -07:00
sysctl_net_ipv4.c	IGMP: Inhibit reports for local multicast groups	2015-08-28 13:28:47 -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: remove tcp_ecn_make_synack() socket argument	2015-09-25 13:00:38 -07:00
tcp_cubic.c	tcp_cubic: do not set epoch_start in the future	2015-09-17 22:35:07 -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: prepare fastopen code for upcoming listener changes	2015-09-29 16:53: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: constify tcp_syn_flood_action() socket argument	2015-09-29 16:53:10 -07:00
tcp_ipv4.c	tcp: prepare fastopen code for upcoming listener changes	2015-09-29 16:53:10 -07:00
tcp_lp.c	tcp: remove in_flight parameter from cong_avoid() methods	2014-05-03 19:23:07 -04:00
tcp_memcontrol.c	memcg: cleanup static keys decrement	2015-02-12 18:54:10 -08:00
tcp_metrics.c	net: Add helper function to compare inetpeer addresses	2015-08-28 13:32:36 -07:00
tcp_minisocks.c	tcp: constify tcp_create_openreq_child() socket argument	2015-09-29 16:53:09 -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: Fix CWV being too strict on thin streams	2015-09-28 22:36:30 -07:00
tcp_probe.c	tcp: whitespace fixes	2014-09-01 18:12:45 -07:00
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: stretch ACK fixes prep	2015-01-28 22:18:37 -08:00
tcp.c	tcp: prepare fastopen code for upcoming listener changes	2015-09-29 16:53:10 -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	net: Remove iocb argument from sendmsg and recvmsg	2015-03-02 13:06:31 -05:00
udp_offload.c	ipv4: coding style: comparison for inequality with NULL	2015-04-03 12:11:15 -04:00
udp_tunnel.c	tunnel: introduce udp_tun_rx_dst()	2015-08-27 15:42:47 -07:00
udp.c	net: Rename IFF_VRF_MASTER to IFF_L3MDEV_MASTER	2015-09-29 20:40:32 -07:00
udplite.c	net: Eliminate no_check from protosw	2014-05-23 16:28:53 -04:00
xfrm4_input.c	netfilter: Pass net into okfn	2015-09-17 17:18:37 -07:00
xfrm4_mode_beet.c	ipv4: ERROR: code indent should use tabs where possible	2013-12-26 13:43:21 -05:00
xfrm4_mode_transport.c
xfrm4_mode_tunnel.c	ipv4: hash net ptr into fragmentation bucket selection	2015-03-25 14:07:04 -04:00
xfrm4_output.c	netfilter: Add blank lines in callers of netfilter hooks	2015-09-17 17:18:37 -07:00
xfrm4_policy.c	net: Replace vrf_master_ifindex{, _rcu} with l3mdev equivalents	2015-09-29 20:40:33 -07:00
xfrm4_protocol.c	xfrm4: Remove duplicate semicolon	2014-06-30 07:49:47 +02:00
xfrm4_state.c	inet: make no_pmtu_disc per namespace and kill ipv4_config	2013-12-18 16:58:20 -05:00
xfrm4_tunnel.c	sit: add IPv4 over IPv4 support	2013-05-31 17:19:05 -07:00