leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
6b6f302ceda7a052dab545d6c69abf5f0d4a6cab
linux/net/ipv4
History
David S. Miller d5c1d8c567 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	net/netfilter/nf_tables_core.c

The nf_tables_core.c conflict was resolved using a conflict resolution
from Stephen Rothwell as a guide.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-03-23 22:22:43 -04:00
..
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-03-23 22:22:43 -04:00
af_inet.c
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
ah4.c
ipsec: Remove obsolete MAX_AH_AUTH_LEN
2014-09-18 10:54:36 +02:00
arp.c
neigh: Factor out ___neigh_lookup_noref
2015-03-04 00:23:23 -05:00
cipso_ipv4.c
cipso: don't use IPCB() to locate the CIPSO IP option
2015-02-11 14:46:37 -05:00
datagram.c
…
devinet.c
ipv4, ipv6: kill ip_mc_{join, leave}_group and ipv6_sock_mc_{join, drop}
2015-03-18 22:05:09 -04:00
esp4.c
net: esp: Convert NETDEBUG to pr_info
2014-11-06 15:11:10 -05:00
fib_frontend.c
fib_trie: Avoid NULL pointer if local table is not allocated
2015-03-12 18:26:51 -04:00
fib_lookup.h
ipv4: FIB Local/MAIN table collapse
2015-03-11 16:22:14 -04:00
fib_rules.c
ipv4: FIB Local/MAIN table collapse
2015-03-11 16:22:14 -04:00
fib_semantics.c
net: Kill hold_net release_net
2015-03-12 14:39:40 -04:00
fib_trie.c
fib_trie: Fix regression in handling of inflate/halve failure
2015-03-23 16:58:32 -04:00
fou.c
gue: Use checksum partial with remote checksum offload
2015-02-11 15:12:13 -08:00
geneve.c
openvswitch: Add support for checksums on UDP tunnels.
2015-01-28 23:04:15 -08: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
gre: Set inner mac header in gro complete
2014-12-05 21:18:34 -08:00
icmp.c
ipv4: icmp: use percpu allocation
2015-01-31 17:48:18 -08:00
igmp.c
ipv4, ipv6: kill ip_mc_{join, leave}_group and ipv6_sock_mc_{join, drop}
2015-03-18 22:05:09 -04:00
inet_connection_sock.c
net: convert syn_wait_lock to a spinlock
2015-03-23 16:52:26 -04:00
inet_diag.c
net: convert syn_wait_lock to a spinlock
2015-03-23 16:52:26 -04:00
inet_fragment.c
net: Convert LIMIT_NETDEBUG to net_dbg_ratelimited
2014-11-11 14:10:31 -05:00
inet_hashtables.c
inet: get rid of last __inet_hash_connect() argument
2015-03-18 22:00:35 -04:00
inet_lro.c
…
inet_timewait_sock.c
inet: add a schedule point in inet_twsk_purge()
2015-03-18 22:38:13 -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: ip_check_defrag should not assume that skb_network_offset is zero
2015-03-05 21:43:48 -05:00
ip_gre.c
gre/ipip: use be16 variants of netlink functions
2015-02-08 16:28:06 -08:00
ip_input.c
…
ip_options.c
ipv4: rename ip_options_echo to __ip_options_echo()
2014-09-28 16:35:42 -04:00
ip_output.c
netfilter: bridge: kill nf_bridge_pad
2015-03-22 19:45:55 +01:00
ip_sockglue.c
ipv4, ipv6: kill ip_mc_{join, leave}_group and ipv6_sock_mc_{join, drop}
2015-03-18 22:05:09 -04:00
ip_tunnel_core.c
ipv4: fix a potential use after free in ip_tunnel_core.c
2014-10-17 23:45:26 -04:00
ip_tunnel.c
tunnels: advertise link netns via netlink
2015-01-19 14:32:03 -05:00
ip_vti.c
tunnels: advertise link netns via netlink
2015-01-19 14:32:03 -05:00
ipcomp.c
…
ipconfig.c
net: ipv4: handle DSA enabled master network devices
2015-01-19 15:45:10 -05:00
ipip.c
gre/ipip: use be16 variants of netlink functions
2015-02-08 16:28:06 -08:00
ipmr.c
net: Introduce possible_net_t
2015-03-12 14:39:40 -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
…
ping.c
netns: constify net_hash_mix() and various callers
2015-03-18 22:00:34 -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
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
route.c
net: Remove protocol from struct dst_ops
2015-03-09 16:06:10 -04:00
syncookies.c
inet: get rid of central tcp/dccp listener timer
2015-03-20 12:40:25 -04:00
sysctl_net_ipv4.c
ipv4: Create probe timer for tcp PMTU as per RFC4821
2015-03-06 14:57:42 -05: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
inet_diag: add const to inet_diag_req_v2
2015-03-10 13:45:28 -04:00
tcp_fastopen.c
inet: get rid of central tcp/dccp listener timer
2015-03-20 12:40:25 -04:00
tcp_highspeed.c
…
tcp_htcp.c
…
tcp_hybla.c
…
tcp_illinois.c
…
tcp_input.c
inet: drop prev pointer handling in request sock
2015-03-20 12:40:25 -04:00
tcp_ipv4.c
inet: fix double request socket freeing
2015-03-23 21:40:48 -04:00
tcp_lp.c
…
tcp_memcontrol.c
memcg: cleanup static keys decrement
2015-02-12 18:54:10 -08:00
tcp_metrics.c
tcp_metrics: fix wrong lockdep annotations
2015-03-16 16:32:23 -04:00
tcp_minisocks.c
inet: get rid of central tcp/dccp listener timer
2015-03-20 12:40:25 -04:00
tcp_offload.c
tcp: cleanup static functions
2015-02-28 16:56:51 -05:00
tcp_output.c
Revert "selinux: add a skb_owned_by() hook"
2015-03-20 21:36:53 -04:00
tcp_probe.c
…
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_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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-03-09 23:38:02 -04:00
tunnel4.c
…
udp_diag.c
inet_diag: add const to inet_diag_req_v2
2015-03-10 13:45:28 -04:00
udp_impl.h
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
udp_offload.c
udp: Set SKB_GSO_UDP_TUNNEL* in UDP GRO path
2015-02-11 15:12:10 -08:00
udp_tunnel.c
udp: Do not require sock in udp_tunnel_xmit_skb
2015-01-24 23:15:40 -08:00
udp.c
netns: constify net_hash_mix() and various callers
2015-03-18 22:00:34 -04:00
udplite.c
…
xfrm4_input.c
…
xfrm4_mode_beet.c
…
xfrm4_mode_transport.c
…
xfrm4_mode_tunnel.c
…
xfrm4_output.c
xfrm: Fix local error reporting crash with interfamily tunnels
2015-02-09 11:14:17 +01:00
xfrm4_policy.c
net: Remove protocol from struct dst_ops
2015-03-09 16:06:10 -04:00
xfrm4_protocol.c
…
xfrm4_state.c
…
xfrm4_tunnel.c
…