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

Conflicts:

	drivers/net/wireless/rt2x00/Kconfig
	drivers/net/wireless/rt2x00/rt2x00usb.c
	net/sctp/protocol.c

2008-06-16 18:25:48 -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

[IPV6]: ipv6_addr_type() doesn't know about RFC4193 addresses.

2007-07-31 02:28:21 -07:00

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

addrlabel.c

ipv6 netns: Address labels per namespace

2008-06-12 02:38:15 +09:00

af_inet6.c

net: change proto destroy method to return void

2008-06-14 17:04:49 -07:00

ah6.c

[IPSEC]: Fix bogus usage of u64 on input sequence number

2008-02-12 22:50:35 -08:00

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

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

2008-06-13 20:52:39 -07:00

esp6.c

[ESP]: Ensure IV is in linear part of the skb to avoid BUG() due to OOB access

2008-03-27 16:08:03 -07:00

exthdrs_core.c

[NET] IPV6: Fix whitespace errors.

2007-02-10 23:19:42 -08:00

exthdrs.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

fib6_rules.c

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

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

icmp.c

net: remove CVS keywords

2008-06-11 21:00:38 -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

inet6: add struct net argument to inet6_ehashfn

2008-06-16 17:13:48 -07:00

ip6_fib.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

ip6_flowlabel.c

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

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

ip6_input.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

ip6_output.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

ip6_tunnel.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

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

ipcomp6.c

net: Remove unnecessary inclusions of asm/semaphore.h

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

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

Kconfig

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

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

Makefile

[IPV6] MROUTE: Support multicast forwarding.

2008-04-05 22:33:38 +09:00

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

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

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

net: change proto destroy method to return void

2008-06-14 17:04:49 -07:00

reassembly.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

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

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

syncookies.c

inet{6}_request_sock: Init ->opt and ->pktopts in the constructor

2008-06-10 12:39:35 -07:00

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

net: change proto destroy method to return void

2008-06-14 17:04:49 -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

net: change proto destroy method to return void

2008-06-14 17:04:49 -07:00

udp.c

udp: add struct net argument to udp_hashfn

2008-06-16 17:12:29 -07:00

udplite.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

xfrm6_input.c

[XFRM] IPV6: Optimize xfrm6_input_addr().

2008-03-25 10:23:56 +09:00

xfrm6_mode_beet.c

[IPSEC]: Fix BEET output

2008-03-26 16:51:09 -07:00

xfrm6_mode_ro.c

[IPSEC]: Make x->lastused an unsigned long

2008-01-28 14:53:52 -08:00

xfrm6_mode_transport.c

[IPSEC]: Use IPv6 calling convention as the convention for x->mode->output

2007-10-10 16:55:54 -07:00

xfrm6_mode_tunnel.c

[IPSEC]: Fix inter address family IPsec tunnel handling.

2008-03-24 14:51:51 -07:00

xfrm6_output.c

[IPSEC]: Fix inter address family IPsec tunnel handling.

2008-03-24 14:51:51 -07:00

xfrm6_policy.c

[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.

2008-03-26 04:39:53 +09:00

xfrm6_state.c

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

2008-03-27 18:48:56 -07:00

xfrm6_tunnel.c

[XFRM] IPV6: Optimize __xfrm_tunnel_alloc_spi().

2008-03-25 10:23:57 +09:00