netns: add net parameter to IP6_INC_STATS
authorDenis V. Lunev <den@openvz.org>
Wed, 8 Oct 2008 17:54:51 +0000 (10:54 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 Oct 2008 17:54:51 +0000 (10:54 -0700)
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/ipv6.h
net/ipv6/icmp.c
net/ipv6/ip6_output.c
net/ipv6/mcast.c
net/ipv6/ndisc.c
net/ipv6/netfilter.c
net/ipv6/raw.c
net/ipv6/reassembly.c
net/ipv6/route.c

Simple merge
diff --cc net/ipv6/icmp.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv6/raw.c
Simple merge
Simple merge
Simple merge