iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/net/ipv4
History
Pablo Neira Ayuso f20fbc0717 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 
Conflicts:
	net/netfilter/core.c
	net/netfilter/nf_tables_netdev.c

Resolve two conflicts before pull request for David's net-next tree:

1) Between c73c24849011 ("netfilter: nf_tables_netdev: remove redundant
   ip_hdr assignment") from the net tree and commit ddc8b6027ad0
   ("netfilter: introduce nft_set_pktinfo_{ipv4, ipv6}_validate()").

2) Between e8bffe0cf964 ("net: Add _nf_(un)register_hooks symbols") and
   Aaron Conole's patches to replace list_head with single linked list.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2016-09-25 23:34:19 +02:00
..
netfilter
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2016-09-25 23:34:19 +02:00
af_inet.c
gso: Support partial splitting at the frag_list pointer
2016-09-19 20:59:34 -04:00
ah4.c
ah4: Fix error return in ah_input().
2015-08-25 13:38:50 -07:00
arp.c
net: rename NET_{ADD|INC}_STATS_BH()
2016-04-27 22:48:24 -04:00
cipso_ipv4.c
Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/selinux into next
2016-07-07 10:15:34 +10:00
datagram.c
net: Set sk_txhash from a random number
2015-07-29 22:44:04 -07:00
devinet.c
netconf: add a notif when settings are created
2016-09-01 15:18:08 -07:00
esp4.c
esp: Fix ESN generation under UDP encapsulation
2016-06-23 11:52:00 -04:00
fib_frontend.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-09-12 15:52:44 -07:00
fib_lookup.h
ipv4: consider TOS in fib_select_default
2015-07-24 22:46:11 -07:00
fib_rules.c
net: flow: Add l3mdev flow update
2016-09-10 23:12:51 -07:00
fib_semantics.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-09-12 15:52:44 -07:00
fib_trie.c
ipv4: fix value of ->nlmsg_flags reported in RTM_NEWROUTE events
2016-09-09 16:50:23 -07:00
fou.c
fou: make nla_policy const
2016-09-01 14:09:00 -07:00
gre_demux.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-06-30 05:03:36 -04:00
gre_offload.c
gso: Support partial splitting at the frag_list pointer
2016-09-19 20:59:34 -04:00
icmp.c
net: icmp: rename ICMPMSGIN_INC_STATS_BH()
2016-04-27 22:48:23 -04:00
igmp.c
net/multicast: should not send source list records when have filter mode change
2016-08-08 16:04:39 -07:00
inet_connection_sock.c
timers, net/ipv4/inet: Initialize connection request timers as pinned
2016-07-07 10:35:06 +02:00
inet_diag.c
net: inet: diag: expose the socket mark to privileged processes.
2016-09-08 16:13:09 -07:00
inet_fragment.c
net: disable fragment reassembly if high_thresh is zero
2016-06-05 22:56:42 -04:00
inet_hashtables.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-05-04 00:52:29 -04:00
inet_timewait_sock.c
timers, net/ipv4/inet: Initialize connection request timers as pinned
2016-07-07 10:35:06 +02:00
inetpeer.c
net: Add helper function to compare inetpeer addresses
2015-08-28 13:32:36 -07:00
ip_forward.c
net/ipv4: Introduce IPSKB_FRAG_SEGS bit to inet_skb_parm.flags
2016-07-19 16:40:22 -07:00
ip_fragment.c
net: rename IP_INC_STATS_BH()
2016-04-27 22:48:23 -04:00
ip_gre.c
net/ip_tunnels: Introduce tunnel_id_to_key32() and key32_to_tunnel_id()
2016-09-10 20:53:55 -07:00
ip_input.c
net: VRF: Pass original iif to ip_route_input()
2016-09-16 04:24:07 -04:00
ip_options.c
net: ipv4: Convert IP network timestamps to be y2038 safe
2016-03-01 17:18:44 -05:00
ip_output.c
net: l3mdev: remove redundant calls
2016-09-10 23:12:52 -07:00
ip_sockglue.c
ipv4: accept u8 in IP_TOS ancillary data
2016-09-08 17:45:57 -07:00
ip_tunnel_core.c
ip_tunnel: do not clear l4 hashes
2016-09-09 19:33:11 -07:00
ip_tunnel.c
ip_tunnel: add collect_md mode to IPIP tunnel
2016-09-17 10:13:07 -04:00
ip_vti.c
vti: use right inner_mode for inbound inter address family policy checks
2016-09-09 09:02:08 +02:00
ipcomp.c
ipv4: coding style: comparison for equality with NULL
2015-04-03 12:11:15 -04:00
ipconfig.c
net: ipconfig: Fix NULL pointer dereference on RARP/BOOTP/DHCP timeout
2016-08-22 21:04:41 -07:00
ipip.c
ip_tunnel: add collect_md mode to IPIP tunnel
2016-09-17 10:13:07 -04:00
ipmr.c
ipmr, ip6mr: return lastuse relative to now
2016-09-21 00:58:23 -04:00
Kconfig
tcp_bbr: add BBR congestion control
2016-09-21 00:23:01 -04:00
Makefile
tcp_bbr: add BBR congestion control
2016-09-21 00:23:01 -04:00
netfilter.c
ipv4: Pass struct net into ip_route_me_harder
2015-09-29 20:21:32 +02:00
ping.c
sock: enable timestamping using control messages
2016-04-04 15:50:30 -04:00
proc.c
tcp: md5: add LINUX_MIB_TCPMD5FAILURE counter
2016-08-25 16:43:11 -07:00
protocol.c
net: Export inet_offloads and inet6_offloads
2014-09-19 17:15:31 -04:00
raw.c
net: ipv4: Remove l3mdev_get_saddr
2016-09-10 23:12:53 -07:00
route.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-09-23 06:46:57 -04:00
syncookies.c
net: rename NET_{ADD|INC}_STATS_BH()
2016-04-27 22:48:24 -04:00
sysctl_net_ipv4.c
ipv4: Fix non-initialized TTL when CONFIG_SYSCTL=n
2016-05-23 14:32:06 -07:00
tcp_bbr.c
tcp_bbr: add BBR congestion control
2016-09-21 00:23:01 -04:00
tcp_bic.c
tcp: replace cnt & rtt with struct in pkts_acked()
2016-05-11 14:43:19 -04:00
tcp_cdg.c
tcp: cdg: rename struct minmax in tcp_cdg.c to avoid a naming conflict
2016-09-21 00:22:59 -04:00
tcp_cong.c
tcp: new CC hook to set sending rate with rate_sample in any CA state
2016-09-21 00:23:01 -04:00
tcp_cubic.c
tcp: replace cnt & rtt with struct in pkts_acked()
2016-05-11 14:43:19 -04:00
tcp_dctcp.c
tcp: return sizeof tcp_dctcp_info in dctcp_get_info()
2016-06-14 23:46:30 -07:00
tcp_diag.c
net: diag: Fix refcnt leak in error path destroying socket
2016-08-23 23:11:36 -07:00
tcp_fastopen.c
tcp: fastopen: avoid negative sk_forward_alloc
2016-09-08 16:08: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: replace cnt & rtt with struct in pkts_acked()
2016-05-11 14:43:19 -04: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: replace cnt & rtt with struct in pkts_acked()
2016-05-11 14:43:19 -04:00
tcp_input.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2016-09-25 23:34:19 +02:00
tcp_ipv4.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2016-09-25 23:34:19 +02:00
tcp_lp.c
tcp: replace cnt & rtt with struct in pkts_acked()
2016-05-11 14:43:19 -04:00
tcp_metrics.c
tcp: make nla_policy const
2016-09-01 14:09:01 -07:00
tcp_minisocks.c
tcp: track application-limited rate samples
2016-09-21 00:23:00 -04:00
tcp_nv.c
tcp: add NV congestion control
2016-06-10 23:07:49 -07:00
tcp_offload.c
gso: Support partial splitting at the frag_list pointer
2016-09-19 20:59:34 -04:00
tcp_output.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-09-23 06:46:57 -04:00
tcp_probe.c
net: ipv4: tcp_probe: Replace timespec with timespec64
2016-03-01 17:18:44 -05:00
tcp_rate.c
tcp: export data delivery rate
2016-09-21 00:23:00 -04:00
tcp_recovery.c
tcp: do not assume TCP code is non preemptible
2016-05-02 17:02:25 -04:00
tcp_scalable.c
tcp: add tcp_in_slow_start helper
2015-07-09 14:22:52 -07:00
tcp_timer.c
tcp: properly account Fast Open SYN-ACK retrans
2016-09-22 03:33:01 -04:00
tcp_vegas.c
tcp: replace cnt & rtt with struct in pkts_acked()
2016-05-11 14:43:19 -04:00
tcp_vegas.h
tcp: replace cnt & rtt with struct in pkts_acked()
2016-05-11 14:43:19 -04:00
tcp_veno.c
tcp: replace cnt & rtt with struct in pkts_acked()
2016-05-11 14:43:19 -04:00
tcp_westwood.c
tcp: replace cnt & rtt with struct in pkts_acked()
2016-05-11 14:43:19 -04:00
tcp_yeah.c
tcp: cwnd does not increase in TCP YeAH
2016-09-08 17:16:12 -07:00
tcp.c
tcp: export data delivery rate
2016-09-21 00:23:00 -04:00
tunnel4.c
tunnels: correct conditional build of MPLS and IPv6
2016-07-11 13:27:06 -07:00
udp_diag.c
net: inet: diag: expose the socket mark to privileged processes.
2016-09-08 16:13:09 -07:00
udp_impl.h
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
udp_offload.c
gso: Support partial splitting at the frag_list pointer
2016-09-19 20:59:34 -04:00
udp_tunnel.c
net: Remove deprecated tunnel specific UDP offload functions
2016-06-17 20:23:32 -07:00
udp.c
net: ipv4: Remove l3mdev_get_saddr
2016-09-10 23:12:53 -07:00
udplite.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-08-30 00:54:02 -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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-10-24 06:54:12 -07:00
xfrm4_policy.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-09-12 15:52:44 -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