David S. Miller 99d5ceeea5 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next ... Steffen Klassert says: ==================== pull request (net-next): ipsec-next 2017-02-16 1) Make struct xfrm_input_afinfo const, nothing writes to it. From Florian Westphal. 2) Remove all places that write to the afinfo policy backend and make the struct const then. From Florian Westphal. 3) Prepare for packet consuming gro callbacks and add ESP GRO handlers. ESP packets can be decapsulated at the GRO layer then. It saves a round through the stack for each ESP packet. Please note that this has a merge coflict between commit 63fca65d08 ("net: add confirm_neigh method to dst_ops") from net-next and 3d7d25a68e ("xfrm: policy: remove garbage_collect callback") a2817d8b27 ("xfrm: policy: remove family field") from ipsec-next. The conflict can be solved as it is done in linux-next. Please pull or let me know if there are problems. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2017-02-16 21:25:49 -05:00
..
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2017-02-03 16:58:20 -05:00
af_inet.c	net: Add a skb_gro_flush_final helper.	2017-02-15 09:39:39 +01:00
ah4.c	IPsec: do not ignore crypto err in ah4 input	2017-01-16 12:57:48 +01:00
arp.c	NET: Fix /proc/net/arp for AX.25	2017-02-13 22:15:03 -05:00
cipso_ipv4.c	netlabel: out of bound access in cipso_v4_validate()	2017-02-04 19:44:22 -05:00
datagram.c
devinet.c	net: ipv4: remove fib_lookup.h from devinet.c include list	2017-02-02 23:09:08 -05:00
esp4_offload.c	esp: Add a software GRO codepath	2017-02-15 11:04:11 +01:00
esp4.c	esp: Introduce a helper to setup the trailer	2017-01-17 10:23:08 +01:00
fib_frontend.c	lwtunnel: fix autoload of lwt modules	2017-01-18 17:07:14 -05:00
fib_lookup.h
fib_rules.c
fib_semantics.c	ipv4: fib: Notify about nexthop status changes	2017-02-08 15:25:18 -05:00
fib_trie.c	ipv4: fib: Add events for FIB replace and append	2017-02-10 11:32:13 -05:00
fou.c
gre_demux.c
gre_offload.c
icmp.c	net: for rate-limited ICMP replies save one atomic operation	2017-01-09 15:49:12 -05:00
igmp.c	igmp, mld: Fix memory leak in igmpv3/mld_del_delrec()	2017-02-09 16:43:45 -05:00
inet_connection_sock.c	inet: don't use sk_v6_rcv_saddr directly	2017-01-20 14:35:51 -05:00
inet_diag.c	tcp: remove early retransmit	2017-01-13 22:37:16 -05:00
inet_fragment.c
inet_hashtables.c	inet: kill smallest_size and smallest_port	2017-01-18 13:04:29 -05:00
inet_timewait_sock.c
inetpeer.c
ip_forward.c
ip_fragment.c
ip_gre.c
ip_input.c
ip_options.c
ip_output.c	net: rename dst_neigh_output back to neigh_output	2017-02-11 21:25:18 -05:00
ip_sockglue.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-02-07 16:29:30 -05:00
ip_tunnel_core.c	lwtunnel: remove device arg to lwtunnel_build_state	2017-01-30 15:14:22 -05:00
ip_tunnel.c
ip_vti.c
ipcomp.c
ipconfig.c
ipip.c
ipmr.c	ipmr: improve hash scalability	2017-01-12 16:48:26 -05:00
Kconfig	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2017-02-16 21:25:49 -05:00
Makefile	esp: Add a software GRO codepath	2017-02-15 11:04:11 +01:00
netfilter.c
ping.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-02-11 02:31:11 -05:00
proc.c	net: add LINUX_MIB_PFMEMALLOCDROP counter	2017-02-02 23:34:19 -05:00
protocol.c
raw_diag.c
raw.c	net: use dst_confirm_neigh for UDP, RAW, ICMP, L2TP	2017-02-07 13:07:47 -05:00
route.c	net: add confirm_neigh method to dst_ops	2017-02-07 13:07:46 -05:00
syncookies.c
sysctl_net_ipv4.c	net: Avoid receiving packets with an l3mdev on unbound UDP sockets	2017-01-30 15:00:58 -05:00
tcp_bbr.c
tcp_bic.c
tcp_cdg.c
tcp_cong.c
tcp_cubic.c
tcp_dctcp.c
tcp_diag.c
tcp_fastopen.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
tcp_highspeed.c
tcp_htcp.c
tcp_hybla.c
tcp_illinois.c
tcp_input.c	tcp: replace dst_confirm with sk_dst_confirm	2017-02-07 13:07:46 -05:00
tcp_ipv4.c	tcp: add tcp_mss_clamp() helper	2017-02-03 11:19:34 -05:00
tcp_lp.c
tcp_metrics.c	tcp: replace dst_confirm with sk_dst_confirm	2017-02-07 13:07:46 -05:00
tcp_minisocks.c	tcp: add tcp_mss_clamp() helper	2017-02-03 11:19:34 -05:00
tcp_nv.c
tcp_offload.c
tcp_output.c	tcp: replace dst_confirm with sk_dst_confirm	2017-02-07 13:07:46 -05:00
tcp_probe.c	tcp: tcp_probe: use spin_lock_bh()	2017-02-14 22:19:39 -05:00
tcp_rate.c
tcp_recovery.c	tcp: enable RACK loss detection to trigger recovery	2017-01-13 22:37:16 -05:00
tcp_scalable.c
tcp_timer.c	tcp: remove early retransmit	2017-01-13 22:37:16 -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	2017-02-07 16:29:30 -05:00
tunnel4.c
udp_diag.c
udp_impl.h
udp_offload.c
udp_tunnel.c
udp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-02-07 16:29:30 -05:00
udplite.c
xfrm4_input.c	esp: Add a software GRO codepath	2017-02-15 11:04:11 +01:00
xfrm4_mode_beet.c
xfrm4_mode_transport.c	esp: Add a software GRO codepath	2017-02-15 11:04:11 +01:00
xfrm4_mode_tunnel.c
xfrm4_output.c
xfrm4_policy.c	xfrm: policy: make policy backend const	2017-02-09 10:22:19 +01:00
xfrm4_protocol.c	xfrm: input: constify xfrm_input_afinfo	2017-02-09 10:22:17 +01:00
xfrm4_state.c	xfrm: remove unused function	2017-01-10 10:57:12 +01:00
xfrm4_tunnel.c