David S. Miller da13482534 Merge branch 'master' of git://1984.lsi.us.es/nf-next ... Pablo Neira Ayuso says: ==================== The following patchset contains Netfilter/IPVS updates for your net-next tree, they are: * Better performance in nfnetlink_queue by avoiding copy from the packet to netlink message, from Eric Dumazet. * Remove unnecessary locking in the exit path of ebt_ulog, from Gao Feng. * Use new function ipv6_iface_scope_id in nf_ct_ipv6, from Hannes Frederic Sowa. * A couple of sparse fixes for IPVS, from Julian Anastasov. * Use xor hashing in nfnetlink_queue, as suggested by Eric Dumazet, from myself. * Allow to dump expectations per master conntrack via ctnetlink, from myself. * A couple of cleanups to use PTR_RET in module init path, from Silviu-Mihai Popescu. * Remove nf_conntrack module a bit faster if netns are in use, from Vladimir Davydov. * Use checksum_partial in ip6t_NPT, from YOSHIFUJI Hideaki. * Sparse fix for nf_conntrack, from Stephen Hemminger. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2013-03-25 12:11:44 -04:00
..
netfilter	Merge branch 'master' of git://1984.lsi.us.es/nf-next	2013-03-25 12:11:44 -04:00
Kconfig	net/ipv4: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:40:00 -08:00
Makefile	…
af_inet.c	tunneling: Add generic Tunnel segmentation.	2013-03-09 16:09:17 -05:00
ah4.c	net: Add skb_unclone() helper function.	2013-02-15 15:10:37 -05:00
arp.c	net: proc: change proc_net_remove to remove_proc_entry	2013-02-18 14:53:08 -05:00
cipso_ipv4.c	…
datagram.c	ipv4: Add a socket release callback for datagram sockets	2013-01-21 14:17:05 -05:00
devinet.c	ipv4: provide addr and netconf dump consistency info	2013-03-24 17:16:29 -04:00
esp4.c	xfrm4: Invalidate all ipv4 routes on IPsec pmtu events	2013-01-21 12:43:54 +01:00
fib_frontend.c	rtnetlink: Remove passing of attributes into rtnl_doit functions	2013-03-22 10:31:16 -04:00
fib_lookup.h	…
fib_rules.c	…
fib_semantics.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
fib_trie.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
gre.c	ip_gre: increase inner ip header ID during segmentation	2013-03-22 10:23:34 -04:00
icmp.c	ipv4: fix error handling in icmp_protocol.	2013-02-22 15:10:18 -05:00
igmp.c	net: proc: change proc_net_remove to remove_proc_entry	2013-02-18 14:53:08 -05:00
inet_connection_sock.c	tcp: Remove TCPCT	2013-03-17 14:35:13 -04:00
inet_diag.c	tcp: Tail loss probe (TLP)	2013-03-12 08:30:34 -04:00
inet_fragment.c	inet: generalize ipv4-only RFC3168 5.3 ecn fragmentation handling for future use by ipv6	2013-03-24 17:16:30 -04:00
inet_hashtables.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
inet_lro.c	ipv4: replace ip_fast_csum with csum_replace2	2013-03-15 09:12:25 -04:00
inet_timewait_sock.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
inetpeer.c	…
ip_forward.c	…
ip_fragment.c	inet: generalize ipv4-only RFC3168 5.3 ecn fragmentation handling for future use by ipv6	2013-03-24 17:16:30 -04:00
ip_gre.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-03-20 12:46:26 -04:00
ip_input.c	ipv[4|6]: correct dropwatch false positive in local_deliver_finish	2013-03-01 15:56:29 -05:00
ip_options.c	net/ipv4: Ensure that location of timestamp option is stored	2013-03-12 05:35:39 -04:00
ip_output.c	net: Fix possible wrong checksum generation.	2013-02-13 13:30:10 -05:00
ip_sockglue.c	net: prevent setting ttl=0 via IP_TTL	2013-01-08 17:57:10 -08:00
ip_vti.c	net: Allow userns root to control ipv4	2012-11-18 20:32:45 -05:00
ipcomp.c	ipcomp: Mark as netns_ok.	2013-02-04 15:46:15 -05:00
ipconfig.c	ipconfig: Fix newline handling in log message.	2013-03-20 12:15:58 -04:00
ipip.c	tunnel: use iptunnel_xmit() again	2013-03-10 03:05:44 -04:00
ipmr.c	net: proc: change proc_net_remove to remove_proc_entry	2013-02-18 14:53:08 -05:00
netfilter.c	…
ping.c	ipv4: fix a bug in ping_err().	2013-02-21 15:25:00 -05:00
proc.c	tcp: TLP loss detection.	2013-03-12 08:30:34 -04:00
protocol.c	ipv4: Disallow non-namespace aware protocols to register.	2013-02-05 14:42:23 -05:00
raw.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
route.c	rtnetlink: Remove passing of attributes into rtnl_doit functions	2013-03-22 10:31:16 -04:00
syncookies.c	tcp: Remove TCPCT	2013-03-17 14:35:13 -04:00
sysctl_net_ipv4.c	tcp: refactor F-RTO	2013-03-21 11:47:50 -04:00
tcp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-03-20 12:46:26 -04:00
tcp_bic.c	…
tcp_cong.c	tcp: remove Appropriate Byte Count support	2013-02-05 14:51:16 -05:00
tcp_cubic.c	…
tcp_diag.c	…
tcp_fastopen.c	…
tcp_highspeed.c	…
tcp_htcp.c	…
tcp_hybla.c	…
tcp_illinois.c	net: fix divide by zero in tcp algorithm illinois	2012-11-01 11:55:59 -04:00
tcp_input.c	tcp: implement RFC5682 F-RTO	2013-03-21 11:47:51 -04:00
tcp_ipv4.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-03-20 12:46:26 -04:00
tcp_lp.c	…
tcp_memcontrol.c	…
tcp_metrics.c	tcp: handle tcp_net_metrics_init() order-5 memory allocation failures	2012-11-16 13:36:27 -05:00
tcp_minisocks.c	tcp: refactor F-RTO	2013-03-21 11:47:50 -04:00
tcp_output.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-03-22 12:53:09 -04:00
tcp_probe.c	net: proc: change proc_net_remove to remove_proc_entry	2013-02-18 14:53:08 -05:00
tcp_scalable.c	…
tcp_timer.c	tcp: refactor F-RTO	2013-03-21 11:47:50 -04:00
tcp_vegas.c	…
tcp_vegas.h	…
tcp_veno.c	…
tcp_westwood.c	tcp: refactor F-RTO	2013-03-21 11:47:50 -04:00
tcp_yeah.c	…
tunnel4.c	…
udp.c	udp: increase inner ip header ID during segmentation	2013-03-22 10:23:34 -04:00
udp_diag.c	…
udp_impl.h	…
udplite.c	…
xfrm4_input.c	net: Add skb_unclone() helper function.	2013-02-15 15:10:37 -05:00
xfrm4_mode_beet.c	…
xfrm4_mode_transport.c	…
xfrm4_mode_tunnel.c	ip: fix warning in xfrm4_mode_tunnel_input	2013-02-18 12:42:48 -05:00
xfrm4_output.c	…
xfrm4_policy.c	xfrm: make gc_thresh configurable in all namespaces	2013-02-06 11:36:29 +01:00
xfrm4_state.c	…
xfrm4_tunnel.c	…