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

Conflicts:

	drivers/net/e1000e/ich8lan.c

2008-12-15 20:03:50 -08:00

..

netfilter

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

2008-11-28 02:19:15 -08:00

addrconf_core.c

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

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

addrconf.c

ip: convert to net_device_ops for ioctl

2008-11-19 22:42:41 -08:00

addrlabel.c

net: replace %p6 with %pI6

2008-10-29 12:52:50 -07:00

af_inet6.c

netns xfrm: lookup in netns

2008-11-25 17:35:18 -08:00

ah6.c

netns xfrm: AH/ESP in netns!

2008-11-25 17:59:27 -08:00

anycast.c

net: replace %#p6 format specifier with %pi6

2008-10-29 12:50:24 -07:00

datagram.c

netns xfrm: lookup in netns

2008-11-25 17:35:18 -08:00

esp6.c

netns xfrm: AH/ESP in netns!

2008-11-25 17:59:27 -08:00

exthdrs_core.c

[NET] IPV6: Fix whitespace errors.

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

exthdrs.c

net: replace %p6 with %pI6

2008-10-29 12:52:50 -07:00

fib6_rules.c

netns: Add network namespace argument to rt6_fill_node() and ipv6_dev_get_saddr()

2008-08-14 15:33:21 -07:00

icmp.c

netns xfrm: lookup in netns

2008-11-25 17:35:18 -08:00

inet6_connection_sock.c

netns xfrm: lookup in netns

2008-11-25 17:35:18 -08:00

inet6_hashtables.c

net: Convert TCP/DCCP listening hash tables to use RCU

2008-11-23 17:22:55 -08:00

ip6_fib.c

netns: Add network namespace argument to rt6_fill_node() and ipv6_dev_get_saddr()

2008-08-14 15:33:21 -07:00

ip6_flowlabel.c

ipv6: fix warning in net/ipv6/ip6_flowlabel.c

2008-11-25 16:50:30 -08:00

ip6_input.c

ipv6: added net argument to IP6_INC_STATS_BH

2008-10-08 11:09:27 -07:00

ip6_output.c

netns: ip6mr: allocate mroute6_socket per-namespace.

2008-12-10 16:07:08 -08:00

ip6_tunnel.c

netns xfrm: lookup in netns

2008-11-25 17:35:18 -08:00

ip6mr.c

ip6mr: use goto to common label instead of opencoding

2008-12-14 23:15:49 -08:00

ipcomp6.c

netns xfrm: state lookup in netns

2008-11-25 17:30:50 -08:00

ipv6_sockglue.c

ipv6: routing header fixes

2008-11-12 22:59:21 -08:00

Kconfig

ipsec: ipcomp - Merge IPComp implementations

2008-07-25 02:54:40 -07:00

Makefile

[IPV6] MROUTE: Support multicast forwarding.

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

mcast.c

ipv6/mcast: join error paths using goto

2008-12-14 23:15:21 -08:00

mip6.c

netns xfrm: KM reporting in netns

2008-11-25 17:51:01 -08:00

ndisc.c

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

2008-12-15 20:03:50 -08:00

netfilter.c

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

2008-11-28 02:19:15 -08:00

proc.c

net: fix tiny output corruption of /proc/net/snmp6

2008-11-20 04:20:10 -08:00

protocol.c

net: remove CVS keywords

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

raw.c

netns xfrm: lookup in netns

2008-11-25 17:35:18 -08:00

reassembly.c

net: '&' redux

2008-11-03 18:21:05 -08:00

route.c

netns: ip6mr: enable namespace support in ipv6 multicast forwarding code

2008-12-10 16:30:15 -08:00

sit.c

net: fix tunnels in netns after ndo_ changes

2008-11-23 17:26:26 -08:00

syncookies.c

netns xfrm: lookup in netns

2008-11-25 17:35:18 -08:00

sysctl_net_ipv6.c

net: '&' redux

2008-11-03 18:21:05 -08:00

tcp_ipv6.c

net: Use a percpu_counter for sockets_allocated

2008-11-25 21:16:35 -08: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

udp: introduce struct udp_table and multiple spinlocks

2008-10-29 01:41:45 -07:00

udp.c

netns xfrm: lookup in netns

2008-11-25 17:35:18 -08:00

udplite.c

udp: RCU handling for Unicast packets.

2008-10-29 02:11:14 -07:00

xfrm6_input.c

netns xfrm: per-netns MIBs

2008-11-25 17:59:52 -08:00

xfrm6_mode_beet.c

ipsec: Interfamily IPSec BEET, ipv4-inner ipv6-outer

2008-08-06 02:40:25 -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

netns xfrm: ->get_saddr in netns

2008-11-25 17:56:49 -08:00

xfrm6_state.c

xfrm: remove useless forward declarations

2008-11-25 01:05:54 -08:00

xfrm6_tunnel.c

xfrm6_tunnel: join error paths using goto

2008-12-14 23:13:48 -08:00