mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-08 21:06:24 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
e9bcbc970a774bc8e17fd7eb24b9969be67d666e
linux/net/ipv4
History
David S. Miller 54e5c4def0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/bonding/bond_alb.c
	drivers/net/ethernet/altera/altera_msgdma.c
	drivers/net/ethernet/altera/altera_sgdma.c
	net/ipv6/xfrm6_output.c

Several cases of overlapping changes.

The xfrm6_output.c has a bug fix which overlaps the renaming
of skb->local_df to skb->ignore_df.

In the Altera TSE driver cases, the register access cleanups
in net-next overlapped with bug fixes done in net.

Similarly a bug fix to send ALB packets in the bonding driver using
the right source address overlaps with cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-24 00:32:30 -04:00
..
netfilter
net: rename local_df to ignore_df
2014-05-12 14:03:41 -04:00
af_inet.c
net: Eliminate no_check from protosw
2014-05-23 16:28:53 -04:00
ah4.c
ah4: Use the IPsec protocol multiplexer API
2014-02-25 07:04:17 +01:00
arp.c
ipv4: arp: update neighbour address when a gratuitous arp is received and arp_accept is set
2014-01-02 00:08:38 -05:00
cipso_ipv4.c
ipv4: ERROR: code indent should use tabs where possible
2013-12-26 13:43:21 -05:00
datagram.c
net: Remove FLOWI_FLAG_CAN_SLEEP
2013-12-06 07:24:39 +01:00
devinet.c
ipv4: minor spelling fix
2014-05-18 21:10:29 -04:00
esp4.c
esp4: Use the IPsec protocol multiplexer API
2014-02-25 07:04:17 +01:00
fib_frontend.c
ipv4, fib: pass LOOPBACK_IFINDEX instead of 0 to flowi4_iif
2014-04-16 15:05:11 -04:00
fib_lookup.h
ipv4: make fib_detect_death static
2013-12-28 17:01:46 -05:00
fib_rules.c
inet: fix NULL pointer Oops in fib(6)_rule_suppress
2013-12-10 17:54:23 -05:00
fib_semantics.c
ipv4: fib_semantics: increment fib_info_cnt after fib_info allocation
2014-05-07 17:14:32 -04:00
fib_trie.c
seq_file: remove "%n" usage from seq_file users
2013-11-15 09:32:20 +09:00
gre_demux.c
gre: Call skb_checksum_simple_validate
2014-05-08 23:47:50 -04:00
gre_offload.c
net/ipv4: don't use module_init in non-modular gre_offload
2014-01-16 16:08:27 -08:00
icmp.c
net: add a sysctl to reflect the fwmark on replies
2014-05-13 18:35:08 -04:00
igmp.c
igmp: Call skb_checksum_simple_validate
2014-05-08 23:47:50 -04:00
inet_connection_sock.c
ipv4: make ip_local_reserved_ports per netns
2014-05-14 15:31:45 -04:00
inet_diag.c
inet_diag: fix inet_diag_dump_icsk() to use correct state for timewait sockets
2014-01-13 22:35:46 -08:00
inet_fragment.c
inet: frag: make sure forced eviction removes all frags
2014-03-06 15:28:45 -05:00
inet_hashtables.c
net: Use a more standard macro for INET_ADDR_COOKIE
2014-05-14 16:07:23 -04:00
inet_lro.c
lro: remove dead code
2013-12-29 16:34:25 -05:00
inet_timewait_sock.c
tcp/dccp: remove twchain
2013-10-08 23:19:24 -04:00
inetpeer.c
inetpeer_gc_worker: trivial cleanup
2014-04-26 12:52:28 -04:00
ip_forward.c
net: rename local_df to ignore_df
2014-05-12 14:03:41 -04:00
ip_fragment.c
ipv4: fix "conntrack zones" support for defrag user check in ip_expire
2014-05-05 16:02:59 +02:00
ip_gre.c
gre: add x-netns support
2014-04-23 14:53:36 -04:00
ip_input.c
net: Fix memory leak if TPROXY used with TCP early demux
2014-01-27 16:22:11 -08:00
ip_options.c
ipv4: Use predefined value for readability
2014-04-28 13:28:43 -04:00
ip_output.c
net: add a sysctl to reflect the fwmark on replies
2014-05-13 18:35:08 -04:00
ip_sockglue.c
ipv4: yet another new IP_MTU_DISCOVER option IP_PMTUDISC_OMIT
2014-02-26 15:51:00 -05:00
ip_tunnel_core.c
ipv4: add a sock pointer to dst->output() path.
2014-04-15 13:47:15 -04:00
ip_tunnel.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-05-24 00:32:30 -04:00
ip_vti.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
2014-05-15 23:23:48 -04:00
ipcomp.c
ipcomp4: Use the IPsec protocol multiplexer API
2014-02-25 07:04:17 +01:00
ipconfig.c
ipv4: ipconfig.c: add parentheses in an if statement
2014-02-14 00:14:23 -05:00
ipip.c
net: tunnels - enable module autoloading
2014-05-21 15:46:52 -04:00
ipmr.c
ipv4, fib: pass LOOPBACK_IFINDEX instead of 0 to flowi4_iif
2014-04-16 15:05:11 -04:00
Kconfig
net: neighbour: Remove CONFIG_ARPD
2013-09-03 21:41:43 -04:00
Makefile
xfrm4: Add IPsec protocol multiplexer
2014-02-25 07:04:16 +01:00
netfilter.c
netfilter: remove double colon
2014-02-19 11:41:25 +01:00
ping.c
ping: move ping_group_range out of CONFIG_SYSCTL
2014-05-08 22:50:47 -04:00
proc.c
net: clean up snmp stats code
2014-05-07 16:06:05 -04:00
protocol.c
net: remove outdated comment for ipv4 and ipv6 protocol handler
2013-11-28 18:47:51 -05:00
raw.c
ipv6: honor IPV6_PKTINFO with v4 mapped addresses on sendmsg
2014-02-19 16:28:42 -05:00
route.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-05-24 00:32:30 -04:00
syncookies.c
net: support marking accepting TCP sockets
2014-05-13 18:35:09 -04:00
sysctl_net_ipv4.c
ipv4: make ip_local_reserved_ports per netns
2014-05-14 15:31:45 -04:00
tcp_bic.c
tcp: remove in_flight parameter from cong_avoid() methods
2014-05-03 19:23:07 -04:00
tcp_cong.c
tcp: remove in_flight parameter from cong_avoid() methods
2014-05-03 19:23:07 -04:00
tcp_cubic.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-05-12 13:19:14 -04: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: IPv6 support for fastopen server
2014-05-13 17:53:03 -04:00
tcp_highspeed.c
tcp: remove in_flight parameter from cong_avoid() methods
2014-05-03 19:23:07 -04:00
tcp_htcp.c
tcp: remove in_flight parameter from cong_avoid() methods
2014-05-03 19:23:07 -04:00
tcp_hybla.c
tcp: remove in_flight parameter from cong_avoid() methods
2014-05-03 19:23:07 -04:00
tcp_illinois.c
tcp: remove in_flight parameter from cong_avoid() methods
2014-05-03 19:23:07 -04:00
tcp_input.c
tcp: remove in_flight parameter from cong_avoid() methods
2014-05-03 19:23:07 -04:00
tcp_ipv4.c
net: support marking accepting TCP sockets
2014-05-13 18:35:09 -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
cgroup: drop const from @buffer of cftype->write_string()
2014-03-19 10:23:54 -04:00
tcp_metrics.c
tcp: switch rtt estimations to usec resolution
2014-02-26 17:08:40 -05:00
tcp_minisocks.c
tcp: use tcp_v4_send_synack on first SYN-ACK
2014-05-13 17:53:02 -04:00
tcp_offload.c
tcp: do not export tcp_gso_segment() and tcp_gro_receive()
2014-01-14 18:53:48 -08:00
tcp_output.c
tcp: make cwnd-limited checks measurement-based, and gentler
2014-05-22 12:04:49 -04:00
tcp_probe.c
tcp: switch rtt estimations to usec resolution
2014-02-26 17:08:40 -05:00
tcp_scalable.c
tcp: remove in_flight parameter from cong_avoid() methods
2014-05-03 19:23:07 -04:00
tcp_timer.c
tcp: snmp stats for Fast Open, SYN rtx, and data pkts
2014-03-03 15:58:03 -05:00
tcp_vegas.c
tcp: remove in_flight parameter from cong_avoid() methods
2014-05-03 19:23:07 -04:00
tcp_vegas.h
net: ipv4/ipv6: Remove extern from function prototypes
2013-10-19 19:12:11 -04:00
tcp_veno.c
tcp: remove in_flight parameter from cong_avoid() methods
2014-05-03 19:23:07 -04:00
tcp_westwood.c
tcp: remove unused min_cwnd member of tcp_congestion_ops
2014-02-13 18:22:34 -05:00
tcp_yeah.c
tcp: remove in_flight parameter from cong_avoid() methods
2014-05-03 19:23:07 -04:00
tcp.c
tcp: Add a TCP_FASTOPEN socket option to get a max backlog on its listner
2014-04-20 18:18:54 -04:00
tunnel4.c
net: Convert printks to pr_<level>
2012-03-11 23:42:51 -07:00
udp_diag.c
netlink: rename ssk to sk in struct netlink_skb_params
2013-04-19 14:57:56 -04:00
udp_impl.h
net: ipv4/ipv6: Remove extern from function prototypes
2013-10-19 19:12:11 -04:00
udp_offload.c
net/ipv4: Use proper RCU APIs for writer-side in udp_offload.c
2014-02-04 20:01:55 -08:00
udp.c
net: Make enabling of zero UDP6 csums more restrictive
2014-05-23 16:28:53 -04:00
udplite.c
net: Eliminate no_check from protosw
2014-05-23 16:28:53 -04:00
xfrm4_input.c
xfrm4: Add IPsec protocol multiplexer
2014-02-25 07:04:16 +01: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
[IPSEC]: Use IPv6 calling convention as the convention for x->mode->output
2007-10-10 16:55:54 -07:00
xfrm4_mode_tunnel.c
xfrm4: Remove xfrm_tunnel_notifier
2014-02-25 07:04:18 +01:00
xfrm4_output.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-05-24 00:32:30 -04:00
xfrm4_policy.c
xfrm: Introduce xfrm_input_afinfo to access the the callbacks properly
2014-03-14 07:28:07 +01:00
xfrm4_protocol.c
xfrm4: Properly handle unsupported protocols
2014-04-29 08:41:12 +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