Merge commit 'v3.17' into next

[firefly-linux-kernel-4.4.55.git] / security / selinux / netif.c

diff --git a/security/selinux/netif.c b/security/selinux/netif.c
index 485524c477a40a66a54f23349e666824dc7aaee8..e607b4473ef678c71e8a7a882f9b298491b52dd9 100644 (file)
--- a/security/selinux/netif.c
+++ b/security/selinux/netif.c
@@ -275,7 +275,7 @@ static struct notifier_block sel_netif_netdev_notifier = {
 
 static __init int sel_netif_init(void)
 {
-       int i, err;
+       int i;
 
        if (!selinux_enabled)
                return 0;
@@ -285,7 +285,7 @@ static __init int sel_netif_init(void)
 
        register_netdevice_notifier(&sel_netif_netdev_notifier);
 
-       return err;
+       return 0;
 }
 
 __initcall(sel_netif_init);