sctp: add sctp_packet_singleton

[linux.git] / security / selinux / netnode.c

diff --git a/security/selinux/netnode.c b/security/selinux/netnode.c
index ddf3152608396d3c2cc933467440c78b8c03a504..6dd89b89bc1f6f2fa8cad39b567d18e93ef5e2b9 100644 (file)
--- a/security/selinux/netnode.c
+++ b/security/selinux/netnode.c
@@ -215,12 +215,12 @@ static int sel_netnode_sid_slow(void *addr, u16 family, u32 *sid)
                goto out;
        switch (family) {
        case PF_INET:
-               ret = security_node_sid(PF_INET,
+               ret = security_node_sid(&selinux_state, PF_INET,
                                        addr, sizeof(struct in_addr), sid);
                new->nsec.addr.ipv4 = *(__be32 *)addr;
                break;
        case PF_INET6:
-               ret = security_node_sid(PF_INET6,
+               ret = security_node_sid(&selinux_state, PF_INET6,
                                        addr, sizeof(struct in6_addr), sid);
                new->nsec.addr.ipv6 = *(struct in6_addr *)addr;
                break;
@@ -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);