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

Conflicts:
	drivers/net/bnx2x/bnx2x_cmn.c

2011-03-10 14:26:00 -08:00

..

netfilter

xfrm: Return dst directly from xfrm_lookup()

2011-03-02 13:27:41 -08:00

addrconf_core.c

ipv6: Remove IPV6_ADDR_RESERVED

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

addrconf.c

ipv6: hash is calculated but not used afterwards

2011-02-25 14:00:22 -08: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

ipv6: Consolidate route lookup sequences.

2011-03-01 13:19:07 -08:00

ah6.c

ah: reload pointers to skb data after calling skb_cow_data()

2011-01-11 14:03:10 -08:00

anycast.c

net-next: remove useless union keyword

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

datagram.c

ipv6: Consolidate route lookup sequences.

2011-03-01 13:19:07 -08:00

esp6.c

xfrm: Traffic Flow Confidentiality for IPv6 ESP

2010-12-10 14:43:59 -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

fib6: use FIB_LOOKUP_NOREF in fib6_rule_lookup()

2010-10-16 11:13:21 -07:00

icmp.c

xfrm: Return dst directly from xfrm_lookup()

2011-03-02 13:27:41 -08:00

inet6_connection_sock.c

ipv6: Consolidate route lookup sequences.

2011-03-01 13:19:07 -08:00

inet6_hashtables.c

tcp: Fix a connect() race with timewait sockets

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

ip6_fib.c

fib: avoid false sharing on fib_table_hash

2010-10-16 11:13:23 -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

xfrm: Return dst directly from xfrm_lookup()

2011-03-02 13:27:41 -08:00

ip6_tunnel.c

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

2011-03-10 14:26:00 -08:00

ip6mr.c

ipv6: ignore rtnl_unicast() return code

2011-02-25 14:00:23 -08:00

ipcomp6.c

xfrm: SA lookups signature with mark

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

ipv6_sockglue.c

tproxy: Add missing CAP_NET_ADMIN check to ipv6 side

2010-10-24 16:07:50 -07:00

Kconfig

ipv6: ip6mr: support multiple tables

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

Makefile

…

mcast.c

mcast: net_device dev not used

2011-03-07 15:51:13 -08:00

mip6.c

xfrm: Mark flowi arg to xfrm_type->reject() const.

2011-02-22 17:59:59 -08:00

ndisc.c

xfrm: Return dst directly from xfrm_lookup()

2011-03-02 13:27:41 -08:00

netfilter.c

xfrm: Return dst directly from xfrm_lookup()

2011-03-02 13:27:41 -08: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

ipv6: Consolidate route lookup sequences.

2011-03-01 13:19:07 -08:00

reassembly.c

ipv6: Prepare the tree for un-inlined jhash.

2010-11-28 11:26:21 -08:00

route.c

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

2011-03-10 14:26:00 -08:00

sit.c

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

2011-03-10 14:26:00 -08:00

syncookies.c

ipv6: Consolidate route lookup sequences.

2011-03-01 13:19:07 -08:00

sysctl_net_ipv6.c

net: Fix ipv6 neighbour unregister_sysctl_table warning

2011-01-31 20:54:17 -08:00

tcp_ipv6.c

ipv6: Consolidate route lookup sequences.

2011-03-01 13:19:07 -08: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

ipv6: Consolidate route lookup sequences.

2011-03-01 13:19:07 -08: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

…

xfrm6_mode_ro.c

…

xfrm6_mode_transport.c

…

xfrm6_mode_tunnel.c

ipv6: Use ip6_dst_hoplimit() instead of direct dst_metric() calls.

2010-12-12 21:14:46 -08: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

xfrm: Handle blackhole route creation via afinfo.

2011-03-01 14:59:04 -08:00

xfrm6_state.c

xfrm: Const'ify tmpl and address arguments to ->init_temprop()

2011-02-23 23:07:37 -08:00

xfrm6_tunnel.c

xfrm6: make xfrm6_tunnel_free_spi local

2010-10-21 03:09:45 -07:00