aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/files
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-05-08 21:52:19 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-05-08 21:52:19 +0000
commit100e795bccaccd50aa9ad3835fc293b241f28b07 (patch)
tree576398a53631596d9213565d1a20850ac371b52e /target/linux/generic/files
parentf5e5477c8135b4a43a9031ca24a2bfc6ec8ff228 (diff)
downloadupstream-100e795bccaccd50aa9ad3835fc293b241f28b07.tar.gz
upstream-100e795bccaccd50aa9ad3835fc293b241f28b07.tar.bz2
upstream-100e795bccaccd50aa9ad3835fc293b241f28b07.zip
kernel: fix warning in swconfig.c with kernel 3.14
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 40733
Diffstat (limited to 'target/linux/generic/files')
-rw-r--r--target/linux/generic/files/drivers/net/phy/swconfig.c16
1 files changed, 10 insertions, 6 deletions
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