leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'v3.17' into next

Browse Source
This commit is contained in:
James Morris
2014-11-19 21:32:12 +11:00
parent 594081ee71 bfe01a5ba2
commit b10778a00d
10352 changed files with 579435 additions and 597815 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
security/selinux/netif.c
View File

@@ -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);

3
security/selinux/netnode.c
View File

@@ -303,7 +303,6 @@ void sel_netnode_flush(void)
static __init int sel_netnode_init(void)
{
int iter;
int ret;
if (!selinux_enabled)
return 0;
@@ -313,7 +312,7 @@ static __init int sel_netnode_init(void)
sel_netnode_hash[iter].size = 0;
}
return ret;
return 0;
}
__initcall(sel_netnode_init);

3
security/selinux/netport.c
View File

@@ -237,7 +237,6 @@ void sel_netport_flush(void)
static __init int sel_netport_init(void)
{
int iter;
int ret;
if (!selinux_enabled)
return 0;
@@ -247,7 +246,7 @@ static __init int sel_netport_init(void)
sel_netport_hash[iter].size = 0;
}
return ret;
return 0;
}
__initcall(sel_netport_init);