FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-15 14:10:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux/net/ipv4
History
David S. Miller c85d6975ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/mellanox/mlx4/cmd.c
	net/core/fib_rules.c
	net/ipv4/fib_frontend.c

The fib_rules.c and fib_frontend.c conflicts were locking adjustments
in 'net' overlapping addition and removal of code in 'net-next'.

The mlx4 conflict was a bug fix in 'net' happening in the same
place a constant was being replaced with a more suitable macro.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-04-06 22:34:15 -04:00
..
netfilter
netfilter: Pass nf_hook_state through arpt_do_table().
2015-04-04 13:26:52 -04:00
af_inet.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
ah4.c
ipsec: Remove obsolete MAX_AH_AUTH_LEN
2014-09-18 10:54:36 +02:00
arp.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
cipso_ipv4.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
datagram.c
net: Save TX flow hash in sock and set in skbuf on xmit
2014-07-07 21:14:21 -07:00
devinet.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
esp4.c
ipv4: coding style: comparison for equality with NULL
2015-04-03 12:11:15 -04:00
fib_frontend.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-06 22:34:15 -04:00
fib_lookup.h
ipv4: FIB Local/MAIN table collapse
2015-03-11 16:22:14 -04:00
fib_rules.c
ipv4: coding style: comparison for equality with NULL
2015-04-03 12:11:15 -04:00
fib_semantics.c
ipv4: coding style: comparison for equality with NULL
2015-04-03 12:11:15 -04:00
fib_trie.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
fou.c
gue: Use checksum partial with remote checksum offload
2015-02-11 15:12:13 -08:00
geneve.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
gre_demux.c
net: Fix GRE RX to use skb_transport_header for GRE header offset
2014-09-08 15:23:05 -07:00
gre_offload.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
icmp.c
ipv4: coding style: comparison for equality with NULL
2015-04-03 12:11:15 -04:00
igmp.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
inet_connection_sock.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
inet_diag.c
net: convert syn_wait_lock to a spinlock
2015-03-23 16:52:26 -04:00
inet_fragment.c
ipv4: coding style: comparison for equality with NULL
2015-04-03 12:11:15 -04:00
inet_hashtables.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
inet_lro.c
lro: remove dead code
2013-12-29 16:34:25 -05:00
inet_timewait_sock.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
inetpeer.c
inet: remove dead inetpeer sequence code
2014-09-08 16:42:42 -07:00
ip_forward.c
xps: must clear sender_cpu before forwarding
2015-03-11 23:51:18 -04:00
ip_fragment.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
ip_gre.c
ipv4: coding style: comparison for equality with NULL
2015-04-03 12:11:15 -04:00
ip_input.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
ip_options.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
ip_output.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
ip_sockglue.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
ip_tunnel_core.c
ipv4: hash net ptr into fragmentation bucket selection
2015-03-25 14:07:04 -04:00
ip_tunnel.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
ip_vti.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
ipcomp.c
ipv4: coding style: comparison for equality with NULL
2015-04-03 12:11:15 -04:00
ipconfig.c
ipv4: coding style: comparison for equality with NULL
2015-04-03 12:11:15 -04:00
ipip.c
ipv4: coding style: comparison for equality with NULL
2015-04-03 12:11:15 -04:00
ipmr.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-06 22:34:15 -04:00
Kconfig
net: Move fou_build_header into fou.c and refactor
2014-11-05 16:30:02 -05:00
Makefile
net: Add Geneve tunneling protocol driver
2014-10-06 00:32:20 -04:00
netfilter.c
netfilter: Use nf_hook_state in nf_queue_entry.
2015-04-04 12:25:22 -04:00
ping.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
proc.c
tcp: helpers to mitigate ACK loops by rate-limiting out-of-window dupacks
2015-02-08 01:03:12 -08:00
protocol.c
net: Export inet_offloads and inet6_offloads
2014-09-19 17:15:31 -04:00
raw.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
route.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
syncookies.c
tcp: fix ipv4 mapped request socks
2015-03-25 00:57:48 -04:00
sysctl_net_ipv4.c
ipv4: coding style: comparison for equality with NULL
2015-04-03 12:11:15 -04:00
tcp_bic.c
tcp: stretch ACK fixes prep
2015-01-28 22:18:37 -08:00
tcp_cong.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-03-20 18:51:09 -04:00
tcp_cubic.c
tcp: restore 1.5x per RTT limit to CUBIC cwnd growth in congestion avoidance
2015-03-11 16:51:51 -04:00
tcp_dctcp.c
net: tcp: add DCTCP congestion control algorithm
2014-09-29 00:13:10 -04:00
tcp_diag.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
tcp_fastopen.c
ipv4: coding style: comparison for equality with NULL
2015-04-03 12:11:15 -04:00
tcp_highspeed.c
tcp: whitespace fixes
2014-09-01 18:12:45 -07:00
tcp_htcp.c
tcp: whitespace fixes
2014-09-01 18:12:45 -07:00
tcp_hybla.c
tcp: whitespace fixes
2014-09-01 18:12:45 -07:00
tcp_illinois.c
tcp: whitespace fixes
2014-09-01 18:12:45 -07:00
tcp_input.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-06 22:34:15 -04:00
tcp_ipv4.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04: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
ipv4: coding style: comparison for equality with NULL
2015-04-03 12:11:15 -04:00
tcp_minisocks.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
tcp_offload.c
tcp: cleanup static functions
2015-02-28 16:56:51 -05:00
tcp_output.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
tcp_probe.c
tcp: whitespace fixes
2014-09-01 18:12:45 -07:00
tcp_scalable.c
tcp: stretch ACK fixes prep
2015-01-28 22:18:37 -08:00
tcp_timer.c
inet: remove sk_listener parameter from syn_ack_timeout()
2015-03-23 16:52:25 -04:00
tcp_vegas.c
tcp: whitespace fixes
2014-09-01 18:12:45 -07:00
tcp_vegas.h
…
tcp_veno.c
tcp: stretch ACK fixes prep
2015-01-28 22:18:37 -08:00
tcp_westwood.c
net: tcp: split ack slow/fast events from cwnd_event
2014-09-29 00:13:10 -04:00
tcp_yeah.c
tcp: stretch ACK fixes prep
2015-01-28 22:18:37 -08:00
tcp.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
tunnel4.c
…
udp_diag.c
ipv4: coding style: comparison for equality with NULL
2015-04-03 12:11:15 -04: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
udp: Do not require sock in udp_tunnel_xmit_skb
2015-01-24 23:15:40 -08:00
udp.c
ipv4: coding style: comparison for inequality with NULL
2015-04-03 12:11:15 -04:00
udplite.c
net: Eliminate no_check from protosw
2014-05-23 16:28:53 -04:00
xfrm4_input.c
ipv4: coding style: comparison for equality with NULL
2015-04-03 12:11:15 -04:00
xfrm4_mode_beet.c
…
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
xfrm: Fix local error reporting crash with interfamily tunnels
2015-02-09 11:14:17 +01:00
xfrm4_policy.c
ipv4: coding style: comparison for equality with NULL
2015-04-03 12:11:15 -04:00
xfrm4_protocol.c
xfrm4: Remove duplicate semicolon
2014-06-30 07:49:47 +02:00
xfrm4_state.c
…
xfrm4_tunnel.c
…