From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu, 8 May 2014 21:52:19 +0000 (+0000)
Subject: kernel: fix warning in swconfig.c with kernel 3.14
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=100e795bccaccd50aa9ad3835fc293b241f28b07;p=openwrt%2Fstaging%2Flinusw.git

kernel: fix warning in swconfig.c with kernel 3.14

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 40733
---

diff --git a/target/linux/generic/files/drivers/net/phy/swconfig.c b/target/linux/generic/files/drivers/net/phy/swconfig.c
index c043ee4649..ba9136c34f 100644
--- a/target/linux/generic/files/drivers/net/phy/swconfig.c
+++ b/target/linux/generic/files/drivers/net/phy/swconfig.c
@@ -1107,7 +1107,10 @@ EXPORT_SYMBOL_GPL(unregister_switch);
 static int __init
 swconfig_init(void)
 {
-	int i, err;
+	int err;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0))
+	int i;
+#endif
 
 	INIT_LIST_HEAD(&swdevs);
 	
@@ -1121,16 +1124,17 @@ swconfig_init(void)
 		if (err)
 			goto unregister;
 	}
-#else
-	err = genl_register_family_with_ops(&switch_fam, swconfig_ops);
-	if (err)
-		return err;
-#endif
 	return 0;
 
 unregister:
 	genl_unregister_family(&switch_fam);
 	return err;
+#else
+	err = genl_register_family_with_ops(&switch_fam, swconfig_ops);
+	if (err)
+		return err;
+	return 0;
+#endif
 }
 
 static void __exit