From d8ad0bcc96c14cb445e50c7ad765db2aa71fd866 Mon Sep 17 00:00:00 2001 From: hauke Date: Thu, 8 May 2014 21:52:19 +0000 Subject: [PATCH] kernel: fix warning in swconfig.c with kernel 3.14 Signed-off-by: Hauke Mehrtens git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40733 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/files/drivers/net/phy/swconfig.c | 16 ++++++++++------ 1 file 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 -- 2.11.0