commit 778d80be52699596bf70e0eb0761cf5e1e46088d
author YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Sat Jun 28 14:17:11 2008 +0900
committer YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Thu Jul 03 17:51:55 2008 +0900
tree 607d0bd6fe7c7d6f59d88b9287fc534f6693998d
parent 5ce83afaac956238c3c25f60a899c511e9d8cbf4

ipv6: Add disable_ipv6 sysctl to disable IPv6 operaion on specific interface.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>

net/ipv6/ip6_input.c

diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index 34e5a96..ea81c61 100644
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
@@ -71,7 +71,8 @@
 
 	IP6_INC_STATS_BH(idev, IPSTATS_MIB_INRECEIVES);
 
-	if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
+	if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL ||
+	    !idev || unlikely(idev->cnf.disable_ipv6)) {
 		IP6_INC_STATS_BH(idev, IPSTATS_MIB_INDISCARDS);
 		rcu_read_unlock();
 		goto out;