diff -NurpP --minimal linux-2.6.11.10-vs2.0-p3/kernel/vserver/network.c linux-2.6.11.10-vs2.0.1/kernel/vserver/network.c
--- linux-2.6.11.10-vs2.0-p3/kernel/vserver/network.c	2005-05-22 15:26:47 +0200
+++ linux-2.6.11.10-vs2.0.1/kernel/vserver/network.c	2005-05-22 15:33:54 +0200
@@ -202,21 +202,19 @@ static inline nid_t __nx_dynamic_id(void
 	return 0;
 }
 
-/*	__loc_nx_info()
+/*	__create_nx_info()
 
-	* locate or create the requested context
-	* get() it and if new hash it				*/
+	* create the requested context
+	* get() and hash it				*/
 
-static struct nx_info * __loc_nx_info(int id, int *err)
+static struct nx_info * __create_nx_info(int id)
 {
 	struct nx_info *new, *nxi = NULL;
 
-	vxdprintk(VXD_CBIT(nid, 1), "loc_nx_info(%d)*", id);
+	vxdprintk(VXD_CBIT(nid, 1), "create_nx_info(%d)*", id);
 
-	if (!(new = __alloc_nx_info(id))) {
-		*err = -ENOMEM;
-		return NULL;
-	}
+	if (!(new = __alloc_nx_info(id)))
+		return ERR_PTR(-ENOMEM);
 
 	/* required to make dynamic xids unique */
 	spin_lock(&nx_info_hash_lock);
@@ -226,33 +224,34 @@ static struct nx_info * __loc_nx_info(in
 		id = __nx_dynamic_id();
 		if (!id) {
 			printk(KERN_ERR "no dynamic context available.\n");
+			nxi = ERR_PTR(-EAGAIN);
 			goto out_unlock;
 		}
 		new->nx_id = id;
 	}
-	/* existing context requested */
+	/* static context requested */
 	else if ((nxi = __lookup_nx_info(id))) {
-		/* context in setup is not available */
-		if (nxi->nx_flags & VXF_STATE_SETUP) {
-			vxdprintk(VXD_CBIT(nid, 0),
-				"loc_nx_info(%d) = %p (not available)", id, nxi);
-			nxi = NULL;
-			*err = -EBUSY;
-		} else {
-			vxdprintk(VXD_CBIT(nid, 0),
-				"loc_nx_info(%d) = %p (found)", id, nxi);
-			get_nx_info(nxi);
-			*err = 0;
-		}
+		vxdprintk(VXD_CBIT(nid, 0),
+			"create_nx_info(%d) = %p (already there)", id, nxi);
+		if (nx_info_flags(nxi, NXF_STATE_SETUP, 0))
+			nxi = ERR_PTR(-EBUSY);
+		else
+			nxi = ERR_PTR(-EEXIST);
+		goto out_unlock;
+	}
+	/* dynamic nid creation blocker */
+	else if (id >= MIN_D_CONTEXT) {
+		vxdprintk(VXD_CBIT(nid, 0),
+			"create_nx_info(%d) (dynamic rejected)", id);
+		nxi = ERR_PTR(-EINVAL);
 		goto out_unlock;
 	}
 
-	/* new context requested */
+	/* new context */
 	vxdprintk(VXD_CBIT(nid, 0),
-		"loc_nx_info(%d) = %p (new)", id, new);
+		"create_nx_info(%d) = %p (new)", id, new);
 	__hash_nx_info(get_nx_info(new));
 	nxi = new, new = NULL;
-	*err = 1;
 
 out_unlock:
 	spin_unlock(&nx_info_hash_lock);
@@ -274,6 +273,15 @@ void unhash_nx_info(struct nx_info *nxi)
 	spin_unlock(&nx_info_hash_lock);
 }
 
+#ifdef  CONFIG_VSERVER_LEGACYNET
+
+struct nx_info *create_nx_info(void)
+{
+	return __create_nx_info(NX_DYNAMIC_ID);
+}
+
+#endif
+
 /*	locate_nx_info()
 
 	* search for a nx_info and get() it
@@ -307,28 +315,6 @@ int nid_is_hashed(nid_t nid)
 	return hashed;
 }
 
-#ifdef	CONFIG_VSERVER_LEGACYNET
-
-struct nx_info *locate_or_create_nx_info(int id)
-{
-	int err;
-
-	return __loc_nx_info(id, &err);
-}
-
-struct nx_info *create_nx_info(void)
-{
-	struct nx_info *new;
-	int err;
-
-	vxdprintk(VXD_CBIT(nid, 5), "create_nx_info(%s)", "void");
-	if (!(new = __loc_nx_info(NX_DYNAMIC_ID, &err)))
-		return NULL;
-	return new;
-}
-
-
-#endif
 
 #ifdef	CONFIG_PROC_FS
 
@@ -560,6 +546,11 @@ int vc_net_create(uint32_t nid, void __u
 	if (nid < 2)
 		return -EINVAL;
 
+	new_nxi = __create_nx_info(nid);
+	if (IS_ERR(new_nxi))
+		return PTR_ERR(new_nxi);
+
+/*
 	new_nxi = __loc_nx_info(nid, &ret);
 	if (!new_nxi)
 		return ret;
@@ -567,10 +558,10 @@ int vc_net_create(uint32_t nid, void __u
 		ret = -EEXIST;
 		goto out_put;
 	}
-
+*/
 	ret = new_nxi->nx_id;
 	nx_migrate_task(current, new_nxi);
-out_put:
+	/* if this fails, we might end up with a hashed nx_info */
 	put_nx_info(new_nxi);
 	return ret;
 }
@@ -591,45 +582,6 @@ int vc_net_migrate(uint32_t id, void __u
 	return 0;
 }
 
-int vc_net_add(uint32_t id, void __user *data)
-{
-	struct nx_info *nxi;
-	struct vcmd_net_nx_v0 vc_data;
-
-	if (!capable(CAP_SYS_ADMIN))
-		return -EPERM;
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
-		return -EFAULT;
-
-	nxi = locate_nx_info(id);
-	if (!nxi)
-		return -ESRCH;
-
-	// add ip to net context here
-	put_nx_info(nxi);
-	return 0;
-}
-
-int vc_net_remove(uint32_t id, void __user *data)
-{
-	struct nx_info *nxi;
-	struct vcmd_net_nx_v0 vc_data;
-
-	if (!capable(CAP_SYS_ADMIN))
-		return -EPERM;
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
-		return -EFAULT;
-
-	nxi = locate_nx_info(id);
-	if (!nxi)
-		return -ESRCH;
-
-	// rem ip from net context here
-	put_nx_info(nxi);
-	return 0;
-}
-
-
 
 int vc_get_nflags(uint32_t id, void __user *data)
 {