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

Resolved logic conflicts causing a build failure due to
drivers/net/r8169.c changes using a patch from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

2011-04-26 12:16:46 -07:00

..

netfilter

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

2011-04-19 11:24:06 -07:00

addrconf_core.c

ipv6: Remove IPV6_ADDR_RESERVED

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

addrconf.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -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

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

ah6.c

xfrm: Use separate low and high order bits of the sequence numbers in xfrm_skb_cb

2011-03-13 20:22:28 -07:00

anycast.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

datagram.c

net: Put fl6_* macros to struct flowi6 and use them again.

2011-03-12 15:08:55 -08:00

esp6.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

exthdrs_core.c

net: return operator cleanup

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

exthdrs.c

ipv6: Convert to use flowi6 where applicable.

2011-03-12 15:08:54 -08:00

fib6_rules.c

ipv6: Convert to use flowi6 where applicable.

2011-03-12 15:08:54 -08:00

icmp.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

inet6_connection_sock.c

Revert "tcp: disallow bind() to reuse addr/port"

2011-04-13 12:01:14 -07:00

inet6_hashtables.c

Kill off warning: ‘inline’ is not at beginning of declaration

2011-01-19 15:43:08 +01:00

ip6_fib.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

ip6_flowlabel.c

ipv6: Convert to use flowi6 where applicable.

2011-03-12 15:08:54 -08:00

ip6_input.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

ip6_output.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

ip6_tunnel.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

ip6mr.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

ipcomp6.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

ipv6_sockglue.c

ipv6: Convert to use flowi6 where applicable.

2011-03-12 15:08:54 -08:00

Kconfig

ipv6: ip6mr: support multiple tables

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

Makefile

[IPV6] MROUTE: Support multicast forwarding.

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

mcast.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

mip6.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

ndisc.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

netfilter.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

proc.c

ipv6/udp: report SndbufErrors and RcvbufErrors

2010-10-30 16:17:23 -07:00

protocol.c

net: add __rcu annotations to protocol

2010-10-27 11:37:31 -07:00

raw.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

reassembly.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

route.c

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

2011-04-26 12:16:46 -07:00

sit.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

syncookies.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

sysctl_net_ipv6.c

net ipv6: Fix duplicate /proc/sys/net/ipv6/neigh directory entries.

2011-03-21 18:23:34 -07:00

tcp_ipv6.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

tunnel6.c

tunnels: add _rcu annotations

2010-10-25 13:09:45 -07:00

udp_impl.h

net: Make setsockopt() optlen be unsigned.

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

udp.c

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

2011-04-26 12:16:46 -07:00

udplite.c

net: fix nulls list corruptions in sk_prot_alloc

2010-12-16 14:26:56 -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

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -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

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

xfrm6_output.c

ipv6: Fragment locally generated tunnel-mode IPSec6 packets as needed.

2010-12-19 20:22:23 -08:00

xfrm6_policy.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

xfrm6_state.c

net: Use flowi4 and flowi6 in xfrm layer.

2011-03-12 15:08:52 -08:00

xfrm6_tunnel.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00