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

Conflicts:
	drivers/net/benet/be_main.c

2011-05-11 14:26:58 -04:00

..

netfilter

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

2011-05-11 14:26:58 -04:00

addrconf_core.c

…

addrconf.c

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

2011-05-05 14:59:02 -07:00

addrlabel.c

…

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

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

2011-05-05 14:59:02 -07:00

exthdrs_core.c

…

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

inet: Pass flowi to ->queue_xmit().

2011-05-08 15:28:28 -07:00

inet6_hashtables.c

…

ip6_fib.c

net: dont hold rtnl mutex during netlink dump callbacks

2011-05-02 15:26:28 -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: Decrease overhead of on-stack inet_cork.

2011-05-06 15:37:57 -07:00

ip6_tunnel.c

net: call dev_alloc_name from register_netdevice

2011-05-05 10:57:45 -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

…

Makefile

…

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

ipv4, ipv6, bonding: Restore control over number of peer notifications

2011-04-29 12:44:11 -07:00

netfilter.c

inet: constify ip headers and in6_addr

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

proc.c

…

protocol.c

…

raw.c

inet: Decrease overhead of on-stack inet_cork.

2011-05-06 15:37:57 -07:00

reassembly.c

inet: constify ip headers and in6_addr

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

route.c

net: Use non-zero allocations in dst_alloc().

2011-04-28 22:26:00 -07:00

sit.c

net: call dev_alloc_name from register_netdevice

2011-05-05 10:57:45 -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: add RCU protection to inet->opt

2011-04-28 13:16:35 -07:00

tunnel6.c

…

udp_impl.h

…

udp.c

net:use help function of skb_checksum_start_offset to calculate offset

2011-04-28 13:28:57 -07:00

udplite.c

…

xfrm6_input.c

…

xfrm6_mode_beet.c

inet: constify ip headers and in6_addr

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

xfrm6_mode_ro.c

…

xfrm6_mode_transport.c

…

xfrm6_mode_tunnel.c

inet: constify ip headers and in6_addr

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

xfrm6_output.c

xfrm: Assign the inner mode output function to the dst entry

2011-05-10 15:03:34 -07:00

xfrm6_policy.c

inet: constify ip headers and in6_addr

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

xfrm6_state.c

xfrm: Assign the inner mode output function to the dst entry

2011-05-10 15:03:34 -07:00

xfrm6_tunnel.c

inet: constify ip headers and in6_addr

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