From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Thu, 26 Jul 2007 23:06:47 +0000 (+0000)
Subject: Cleaner remove-all-of-AF_x
X-Git-Tag: linux-2.6-22-1~32
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9b375cf6b7343bce052125e58c9ae11150fae048;p=linux-2.6.git

Cleaner remove-all-of-AF_x
---

diff --git a/include/linux/vserver/network.h b/include/linux/vserver/network.h
index 6195c32ec..b51efa44e 100644
--- a/include/linux/vserver/network.h
+++ b/include/linux/vserver/network.h
@@ -39,6 +39,7 @@
 #define NXA_TYPE_IPV6		2
 
 #define NXA_MOD_BCAST		(1<<8)
+#define NXA_MOD_ALL		(1<<9)
 
 #define NXA_TYPE_ANY		((uint16_t)-1)
 
diff --git a/kernel/vserver/network.c b/kernel/vserver/network.c
index 5388efc09..da08ddc50 100644
--- a/kernel/vserver/network.c
+++ b/kernel/vserver/network.c
@@ -909,6 +909,11 @@ int vc_net_remove(struct nx_info * nxi, void __user *data)
 		}
 		break;
 
+	case NXA_TYPE_IPV4|NXA_MOD_ALL:
+		ret = nxi->nbipv4;
+		nxi->nbipv4 = 0;
+		break;
+
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 	case NXA_TYPE_IPV6:
 		index = 0;
@@ -929,6 +934,11 @@ int vc_net_remove(struct nx_info * nxi, void __user *data)
 			index++;
 		}
 		break;
+
+	case NXA_TYPE_IPV6|NXA_MOD_ALL:
+		ret = nxi->nbipv6;
+		nxi->nbipv6 = 0;
+		break;
 #endif /* CONFIG_IPV6 || CONFIG_IPV6_MODULE */
 
 	default: