android_kernel_xiaomi_sm8350/net/ipv4
David S. Miller 1b63ba8a86 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/wireless/iwlwifi/iwl4965-base.c
2008-06-28 01:19:40 -07:00
..
ipvs net: remove CVS keywords 2008-06-11 21:00:38 -07:00
netfilter Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-06-19 16:00:04 -07:00
af_inet.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
ah4.c
arp.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
cipso_ipv4.c cipso: Relax too much careful cipso hash function. 2008-05-13 23:23:55 -07:00
datagram.c
devinet.c net: Disable LRO on devices that are forwarding 2008-06-19 16:15:47 -07:00
esp4.c
fib_frontend.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
fib_hash.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
fib_lookup.h
fib_rules.c
fib_semantics.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-06-13 20:52:39 -07:00
fib_trie.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
icmp.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
igmp.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
inet_connection_sock.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-06-16 18:25:48 -07:00
inet_diag.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
inet_fragment.c inet fragments: fix race between inet_frag_find and inet_frag_secret_rebuild 2008-06-27 20:06:08 -07:00
inet_hashtables.c inet: add struct net argument to inet_ehashfn 2008-06-16 17:13:27 -07:00
inet_lro.c net/inet_lro: remove setting skb->ip_summed when not LRO-able 2008-06-27 20:09:00 -07:00
inet_timewait_sock.c inet: add struct net argument to inet_bhashfn 2008-06-16 17:12:49 -07:00
inetpeer.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
ip_forward.c net: Discard and warn about LRO'd skbs received for forwarding 2008-06-19 16:22:28 -07:00
ip_fragment.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-06-28 01:19:40 -07:00
ip_gre.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-05-25 23:26:10 -07:00
ip_input.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
ip_options.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
ip_output.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
ip_sockglue.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
ipcomp.c net: Remove unnecessary inclusions of asm/semaphore.h 2008-04-18 22:15:50 -04:00
ipconfig.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
ipip.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
ipmr.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
Kconfig Documentation: move nfsroot.txt to filesystems/ 2008-04-11 13:18:01 -06:00
Makefile
netfilter.c [NETFILTER]: Add partial checksum validation helper 2008-04-14 11:15:49 +02:00
proc.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
protocol.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
raw.c udp: sk_drops handling 2008-06-17 21:04:56 -07:00
route.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
syncookies.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-06-13 20:52:39 -07:00
sysctl_net_ipv4.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
tcp_bic.c
tcp_cong.c tcp: Limit cwnd growth when deferring for GSO 2008-04-29 03:13:52 -07:00
tcp_cubic.c rename div64_64 to div64_u64 2008-05-01 08:03:58 -07:00
tcp_diag.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
tcp_highspeed.c
tcp_htcp.c
tcp_hybla.c net: fix returning void-valued expression warnings 2008-05-01 02:47:38 -07:00
tcp_illinois.c
tcp_input.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-06-13 20:52:39 -07:00
tcp_ipv4.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-06-28 01:19:40 -07:00
tcp_lp.c
tcp_minisocks.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-06-13 20:52:39 -07:00
tcp_output.c Merge branch 'net-next-2.6-misc-20080612a' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-next 2008-06-11 22:33:59 -07:00
tcp_probe.c tcp: tcp_probe buffer overflow and incorrect return value 2008-04-24 21:11:58 -07:00
tcp_scalable.c
tcp_timer.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-06-13 20:52:39 -07:00
tcp_vegas.c net: fix returning void-valued expression warnings 2008-05-01 02:47:38 -07:00
tcp_vegas.h
tcp_veno.c net: fix returning void-valued expression warnings 2008-05-01 02:47:38 -07:00
tcp_westwood.c
tcp_yeah.c
tcp.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-06-28 01:19:40 -07:00
tunnel4.c [IPV4] TUNNEL4: Fix incoming packet length check for inter-protocol tunnel. 2008-06-05 04:02:33 +09:00
udp_impl.h net: change proto destroy method to return void 2008-06-14 17:04:49 -07:00
udp.c udp: sk_drops handling 2008-06-17 21:04:56 -07:00
udplite.c net: remove CVS keywords 2008-06-11 21:00:38 -07:00
xfrm4_input.c
xfrm4_mode_beet.c
xfrm4_mode_transport.c
xfrm4_mode_tunnel.c xfrm: fix fragmentation for ipv4 xfrm tunnel 2008-06-17 16:38:23 -07:00
xfrm4_output.c
xfrm4_policy.c
xfrm4_state.c
xfrm4_tunnel.c