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

Conflicts were easy to resolve using immediate context mostly,
except the cls_u32.c one where I simply too the entire HEAD
chunk.

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

2018-10-12 21:38:46 -07:00

..

bpfilter

…

netfilter

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

2018-10-08 21:28:55 -07:00

af_inet.c

gso_segment: Reset skb->mac_len after modifying network header

2018-09-13 12:09:32 -07:00

ah4.c

net-ipv4: remove 2 always zero parameters from ipv4_redirect()

2018-09-26 20:30:55 -07:00

arp.c

net: Evict neighbor entries on carrier down

2018-10-12 09:47:39 -07:00

cipso_ipv4.c

net/ipv4: defensive cipso option parsing

2018-09-17 19:37:46 -07:00

datagram.c

ipv4: Allow sending multicast packets on specific i/f using VRF socket

2018-10-02 22:28:17 -07:00

devinet.c

net: Update netconf dump handlers for strict data checking

2018-10-08 10:39:05 -07:00

esp4_offload.c

…

esp4.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

2018-10-01 22:31:17 -07:00

fib_frontend.c

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

2018-10-12 21:38:46 -07:00

fib_lookup.h

…

fib_notifier.c

…

fib_rules.c

…

fib_semantics.c

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

2018-10-12 21:38:46 -07:00

fib_trie.c

…

fou.c

…

gre_demux.c

ip_gre: fix parsing gre header in ipgre_err

2018-09-16 15:32:59 -07:00

gre_offload.c

…

icmp.c

net-ipv4: remove 2 always zero parameters from ipv4_redirect()

2018-09-26 20:30:55 -07:00

igmp.c

…

inet_connection_sock.c

inet: make sure to grab rcu_read_lock before using ireq->ireq_opt

2018-10-02 15:52:12 -07:00

inet_diag.c

…

inet_fragment.c

…

inet_hashtables.c

…

inet_timewait_sock.c

…

inetpeer.c

…

ip_forward.c

…

ip_fragment.c

net/ipfrag: let ip[6]frag_high_thresh in ns be higher than in init_net

2018-09-21 19:45:52 -07:00

ip_gre.c

net-ipv4: remove 2 always zero parameters from ipv4_redirect()

2018-09-26 20:30:55 -07:00

ip_input.c

net: Add and use skb_list_del_init().

2018-09-10 10:06:54 -07:00

ip_options.c

…

ip_output.c

net: Add and use skb_mark_not_on_list().

2018-09-10 10:06:54 -07:00

ip_sockglue.c

ipv4: fix use-after-free in ip_cmsg_recv_dstaddr()

2018-10-02 22:32:05 -07:00

ip_tunnel_core.c

…

ip_tunnel.c

ip_tunnel: be careful when accessing the inner header

2018-09-24 12:27:04 -07:00

ip_vti.c

net-ipv4: remove 2 always zero parameters from ipv4_redirect()

2018-09-26 20:30:55 -07:00

ipcomp.c

net-ipv4: remove 2 always zero parameters from ipv4_redirect()

2018-09-26 20:30:55 -07:00

ipconfig.c

…

ipip.c

net-ipv4: remove 2 always zero parameters from ipv4_redirect()

2018-09-26 20:30:55 -07:00

ipmr_base.c

…

ipmr.c

rtnetlink: Update fib dumps for strict data checking

2018-10-08 10:39:05 -07:00

Kconfig

…

Makefile

…

metrics.c

net: common metrics init helper for FIB entries

2018-10-04 21:54:03 -07:00

netfilter.c

…

netlink.c

…

ping.c

ipv4: Allow sending multicast packets on specific i/f using VRF socket

2018-10-02 22:28:17 -07:00

proc.c

…

protocol.c

…

raw_diag.c

…

raw.c

ipv4: Allow sending multicast packets on specific i/f using VRF socket

2018-10-02 22:28:17 -07:00

route.c

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

2018-10-12 21:38:46 -07:00

syncookies.c

tcp: provide earliest departure time in skb->tstamp

2018-09-21 19:37:59 -07:00

sysctl_net_ipv4.c

net-tcp: /proc/sys/net/ipv4/tcp_probe_interval is a u32 not int

2018-09-26 20:33:21 -07:00

tcp_bbr.c

tcp: switch tcp and sch_fq to new earliest departure time model

2018-09-21 19:38:00 -07:00

tcp_bic.c

…

tcp_cdg.c

…

tcp_cong.c

…

tcp_cubic.c

…

tcp_dctcp.c

tcp: refactor DCTCP ECN ACK handling

2018-10-10 22:26:00 -07:00

tcp_dctcp.h

tcp: refactor DCTCP ECN ACK handling

2018-10-10 22:26:00 -07:00

tcp_diag.c

…

tcp_fastopen.c

…

tcp_highspeed.c

…

tcp_htcp.c

…

tcp_hybla.c

…

tcp_illinois.c

…

tcp_input.c

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

2018-10-03 21:00:17 -07:00

tcp_ipv4.c

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

2018-10-03 21:00:17 -07:00

tcp_lp.c

…

tcp_metrics.c

…

tcp_minisocks.c

…

tcp_nv.c

…

tcp_offload.c

…

tcp_output.c

tcp: up initial rmem to 128KB and SYN rwin to around 64KB

2018-09-29 11:22:22 -07:00

tcp_rate.c

tcp: introduce tcp_skb_timestamp_us() helper

2018-09-21 19:37:59 -07:00

tcp_recovery.c

tcp: introduce tcp_skb_timestamp_us() helper

2018-09-21 19:37:59 -07:00

tcp_scalable.c

…

tcp_timer.c

tcp/fq: move back to CLOCK_MONOTONIC

2018-10-01 23:18:51 -07:00

tcp_ulp.c

…

tcp_vegas.c

…

tcp_vegas.h

…

tcp_veno.c

…

tcp_westwood.c

…

tcp_yeah.c

…

tcp.c

tcp: do not release socket ownership in tcp_close()

2018-10-02 22:17:35 -07:00

tunnel4.c

…

udp_diag.c

…

udp_impl.h

…

udp_offload.c

udp: gro behind static key

2018-10-05 11:52:38 -07:00

udp_tunnel.c

…

udp.c

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

2018-10-12 21:38:46 -07:00

udplite.c

…

xfrm4_input.c

…

xfrm4_mode_beet.c

…

xfrm4_mode_transport.c

…

xfrm4_mode_tunnel.c

…

xfrm4_output.c

…

xfrm4_policy.c

…

xfrm4_protocol.c

…

xfrm4_state.c

…

xfrm4_tunnel.c

…