diff -NurpP --minimal linux-3.7.1-vs2.3.5.4/kernel/vserver/inet.c linux-3.7.1-vs2.3.5.5/kernel/vserver/inet.c
--- linux-3.7.1-vs2.3.5.4/kernel/vserver/inet.c	2013-01-04 23:06:14.000000000 +0000
+++ linux-3.7.1-vs2.3.5.5/kernel/vserver/inet.c	2013-01-11 13:43:00.000000000 +0000
@@ -17,18 +17,16 @@ int nx_v4_addr_conflict(struct nx_info *
 		ret = 1;
 	else {
 		struct nx_addr_v4 *ptr;
-		unsigned long flags;
+		unsigned long irqflags;
 
-		spin_lock_irqsave(&nxi1->addr_lock, flags);
-		spin_lock(&nxi2->addr_lock);
+		spin_lock_irqsave(&nxi1->addr_lock, irqflags);
 		for (ptr = &nxi1->v4; ptr; ptr = ptr->next) {
 			if (v4_nx_addr_in_nx_info(nxi2, ptr, -1)) {
 				ret = 1;
 				break;
 			}
 		}
-		spin_unlock(&nxi2->addr_lock);
-		spin_unlock_irqrestore(&nxi1->addr_lock, flags);
+		spin_unlock_irqrestore(&nxi1->addr_lock, irqflags);
 	}
 
 	vxdprintk(VXD_CBIT(net, 2),
@@ -49,18 +47,16 @@ int nx_v6_addr_conflict(struct nx_info *
 		ret = 1;
 	else {
 		struct nx_addr_v6 *ptr;
-		unsigned long flags;
+		unsigned long irqflags;
 
-		spin_lock_irqsave(&nxi1->addr_lock, flags);
-		spin_lock(&nxi2->addr_lock);
+		spin_lock_irqsave(&nxi1->addr_lock, irqflags);
 		for (ptr = &nxi1->v6; ptr; ptr = ptr->next) {
 			if (v6_nx_addr_in_nx_info(nxi2, ptr, -1)) {
 				ret = 1;
 				break;
 			}
 		}
-		spin_unlock(&nxi2->addr_lock);
-		spin_unlock_irqrestore(&nxi1->addr_lock, flags);
+		spin_unlock_irqrestore(&nxi1->addr_lock, irqflags);
 	}
 
 	vxdprintk(VXD_CBIT(net, 2),