David S. Miller 21a180cda0 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	net/ipv4/Kconfig
	net/ipv4/tcp_timer.c

2010-10-04 11:56:38 -07:00

..

netfilter

net: return operator cleanup

2010-09-23 14:33:39 -07:00

addrconf_core.c

ipv6: Remove IPV6_ADDR_RESERVED

2010-02-26 03:59:07 -08:00

addrconf.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-09-27 01:03:03 -07:00

addrlabel.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-09-27 01:03:03 -07:00

af_inet6.c

net: return operator cleanup

2010-09-23 14:33:39 -07:00

ah6.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

anycast.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

datagram.c

udp: add rehash on connect()

2010-09-08 21:45:01 -07:00

esp6.c

xfrm: SA lookups signature with mark

2010-02-22 16:20:22 -08:00

exthdrs_core.c

net: return operator cleanup

2010-09-23 14:33:39 -07:00

exthdrs.c

ipv6: avoid two atomics in ipv6_rthdr_rcv()

2010-06-14 23:13:06 -07:00

fib6_rules.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

icmp.c

ipv6: fix ICMP6_MIB_OUTERRORS

2010-06-09 18:39:27 -07:00

inet6_connection_sock.c

ipv6: Refactor update of IPv6 flowi destination address for srcrt (RH) option

2010-06-02 07:08:31 -07:00

inet6_hashtables.c

tcp: Fix a connect() race with timewait sockets

2009-12-08 20:17:51 -08:00

ip6_fib.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

ip6_flowlabel.c

IPv6: Add dontfrag argument to relevant functions

2010-04-23 23:35:28 -07:00

ip6_input.c

Merge branch 'master' of /repos/git/net-next-2.6

2010-04-20 16:02:01 +02:00

ip6_output.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-09-27 01:03:03 -07:00

ip6_tunnel.c

ip6tnl: percpu stats accounting

2010-09-29 13:25:52 -07:00

ip6mr.c

net: rx_dropped accounting

2010-09-20 10:08:58 -07:00

ipcomp6.c

xfrm: SA lookups signature with mark

2010-02-22 16:20:22 -08:00

ipv6_sockglue.c

ipv6: remove ipv6_statistics

2010-06-25 21:33:17 -07:00

Kconfig

ipv6: ip6mr: support multiple tables

2010-05-11 14:40:55 +02:00

Makefile

…

mcast.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

mip6.c

IPv6: fix CoA check in RH2 input handler (mip6_rthdr_input())

2010-07-18 15:04:33 -07:00

ndisc.c

net: return operator cleanup

2010-09-23 14:33:39 -07:00

netfilter.c

netfilter: kill redundant check code in which setting ip_summed value

2010-06-14 16:20:02 +02:00

proc.c

snmp: 64bit ipstats_mib for all arches

2010-06-30 13:31:19 -07:00

protocol.c

net: inet_add_protocol() can use cmpxchg()

2010-09-08 21:31:35 -07:00

raw.c

net: return operator cleanup

2010-09-23 14:33:39 -07:00

reassembly.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-09-09 22:27:33 -07:00

route.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-10-04 11:56:38 -07:00

sit.c

sit: enable lockless xmits

2010-09-29 13:25:37 -07:00

syncookies.c

syncookies: add support for ECN

2010-06-26 22:00:03 -07:00

sysctl_net_ipv6.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

tcp_ipv6.c

net: return operator cleanup

2010-09-23 14:33:39 -07:00

tunnel6.c

tunnels: missing rcu_assign_pointer()

2010-09-09 15:02:39 -07:00

udp_impl.h

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

udp.c

udp: add rehash on connect()

2010-09-08 21:45:01 -07:00

udplite.c

net: spread __net_init, __net_exit

2010-01-17 19:16:02 -08:00

xfrm6_input.c

netfilter: ipv6: use NFPROTO values for NF_HOOK invocation

2010-03-25 16:00:49 +01:00

xfrm6_mode_beet.c

ipsec: Interfamily IPSec BEET, ipv4-inner ipv6-outer

2008-08-06 02:40:25 -07:00

xfrm6_mode_ro.c

…

xfrm6_mode_transport.c

…

xfrm6_mode_tunnel.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

xfrm6_output.c

netfilter: ipv6: use NFPROTO values for NF_HOOK invocation

2010-03-25 16:00:49 +01:00

xfrm6_policy.c

net: return operator cleanup

2010-09-23 14:33:39 -07:00

xfrm6_state.c

xfrm: Allow different selector family in temporary state

2010-09-20 11:11:38 -07:00

xfrm6_tunnel.c

ipv6: struct xfrm6_tunnel in read_mostly section

2010-08-30 13:50:46 -07:00