From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Mon, 13 Aug 2007 14:57:18 +0000 (+0000)
Subject: Fix weird function...
X-Git-Tag: linux-2.6-22-1~31
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=71ce4fdeaaf3c5274528a4b457ba6ee52bb9b430;p=linux-2.6.git

Fix weird function...
---

diff --git a/kernel/vserver/network.c b/kernel/vserver/network.c
index da08ddc50..12393be67 100644
--- a/kernel/vserver/network.c
+++ b/kernel/vserver/network.c
@@ -534,16 +534,17 @@ void vc_net_unregister_ipv6() {
 }
 
 inline int dev_in_nx_info6(struct net_device *dev, struct nx_info *nxi) {
+	int ret = 0;
+
 	nx_ipv6mod_read_lock();
 	if (try_module_get(vc_net_ipv6.owner)) {
 		if (vc_net_ipv6.dev_in_nx_info6)
-			return vc_net_ipv6.dev_in_nx_info6(dev, nxi);
-		else
-			return 0;
+			ret = vc_net_ipv6.dev_in_nx_info6(dev, nxi);
 		module_put(vc_net_ipv6.owner);
-	} else
-		return 0;
+	}
 	nx_ipv6mod_read_unlock();
+
+	return ret;
 }
 #endif