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

Conflicts:

	drivers/net/cpmac.c
	net/mac80211/mlme.c

2008-05-25 23:26:10 -07:00

..

netfilter

netfilter: {nfnetlink,ip,ip6}_queue: fix skb_over_panic when enlarging packets

2008-04-29 03:16:34 -07:00

addrconf_core.c

…

addrconf.c

ipv6 addrconf: Allow infinite prefix lifetime.

2008-05-19 16:56:11 -07:00

addrlabel.c

…

af_inet6.c

…

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

…

esp6.c

…

exthdrs_core.c

…

exthdrs.c

…

fib6_rules.c

[IPV6] FIB_RULE: Sparse: fib6_rules_cleanup() is of void.

2008-04-11 19:47:53 +09:00

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

…

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: Compilation fix for compat MCAST_MSFILTER sockopts.

2008-04-30 14:49:54 -07: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

[IPV6] MIP6: Use our standard definitions for paddings.

2008-04-12 13:43:22 +09:00

ndisc.c

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

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

netfilter.c

[NETFILTER]: Add partial checksum validation helper

2008-04-14 11:15:49 +02:00

proc.c

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

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

protocol.c

…

raw.c

net: Allow netdevices to specify needed head/tailroom

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

reassembly.c

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

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

route.c

ipsec: Use the correct ip_local_out function

2008-05-20 14:32:14 -07: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

…

udp_impl.h

…

udp.c

[IPv6]: Change IPv6 unspecified destination address to ::1 for raw and un-connected sockets

2008-04-12 13:43:27 +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

…