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

Conflicts:

	drivers/net/tg3.c
	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/mac80211/ieee80211_i.h

2008-06-10 02:22:26 -07:00

..

netfilter

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

2008-06-10 02:22:26 -07:00

addrconf_core.c

…

addrconf.c

[IPV6] ADDRCONF: Allow longer lifetime on 64bit archs.

2008-06-05 04:02:34 +09:00

addrlabel.c

…

af_inet6.c

ipv6 netns: init net is used to set bindv6only for new sock

2008-06-09 15:53:30 -07:00

ah6.c

…

anycast.c

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

2008-04-14 02:30:23 -07:00

datagram.c

[IPV6] NETNS: Handle ancillary data in appropriate namespace.

2008-06-05 04:02:36 +09:00

esp6.c

…

exthdrs_core.c

…

exthdrs.c

…

fib6_rules.c

…

icmp.c

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

2008-04-14 02:30:23 -07:00

inet6_connection_sock.c

[SOCK]: Add some notes about per-bind-bucket sock lookup.

2008-04-14 02:42:27 -07:00

inet6_hashtables.c

…

ip6_fib.c

[NETNS]: The ip6_fib_timer can work with garbage on net namespace stop.

2008-04-21 14:23:03 -07:00

ip6_flowlabel.c

[IPV6] NETNS: Handle ancillary data in appropriate namespace.

2008-06-05 04:02:36 +09:00

ip6_input.c

…

ip6_output.c

net: Allow netdevices to specify needed head/tailroom

2008-05-12 20:48:31 -07:00

ip6_tunnel.c

ip6tnl: Use on-device stats instead of private ones.

2008-05-21 14:17:05 -07:00

ip6mr.c

ip6mr: Use on-device stats instead of private ones.

2008-05-21 14:43:46 -07:00

ipcomp6.c

net: Remove unnecessary inclusions of asm/semaphore.h

2008-04-18 22:15:50 -04:00

ipv6_sockglue.c

[IPV6]: Do not change protocol for UDPv6 sockets with pending sent data.

2008-06-05 04:02:38 +09:00

Kconfig

Revert "ipv6: Fix typo in net/ipv6/Kconfig"

2008-04-27 14:26:50 -07:00

Makefile

…

mcast.c

net: Allow netdevices to specify needed head/tailroom

2008-05-12 20:48:31 -07:00

mip6.c

…

ndisc.c

ndisc: Add missing strategies for per-device retrans timer/reachable time settings.

2008-05-19 16:25:42 -07:00

netfilter.c

…

proc.c

ipv6: assign PDE->data before gluing PDE into /proc tree

2008-05-02 02:46:55 -07:00

protocol.c

…

raw.c

raw: Raw socket leak.

2008-06-04 15:16:12 -07:00

reassembly.c

inet: Register fragmentation some ctls at read-only root.

2008-05-19 13:53:02 -07:00

route.c

[IPV6] ADDRCONF: Allow longer lifetime on 64bit archs.

2008-06-05 04:02:34 +09:00

sit.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

syncookies.c

…

sysctl_net_ipv6.c

ipv6: Register some net/ipv6/ core sysctls at read-only root.

2008-05-19 13:53:30 -07:00

tcp_ipv6.c

[INET]: Drop the inet_inherit_port() call.

2008-04-17 23:17:34 -07:00

tunnel6.c

[IPV6] TUNNEL6: Fix incoming packet length check for inter-protocol tunnel.

2008-06-05 04:02:32 +09:00

udp_impl.h

…

udp.c

[IPV6]: inet_sk(sk)->cork.opt leak

2008-06-05 04:02:38 +09:00

udplite.c

…

xfrm6_input.c

…

xfrm6_mode_beet.c

…

xfrm6_mode_ro.c

…

xfrm6_mode_transport.c

…

xfrm6_mode_tunnel.c

…

xfrm6_output.c

…

xfrm6_policy.c

…

xfrm6_state.c

…

xfrm6_tunnel.c

…