diff options
Diffstat (limited to 'net/core/sock.c')
-rw-r--r-- | net/core/sock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index e1f6f225f012..ceef50bd131b 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
@@ -741,7 +741,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname, | |||
741 | struct timeval tm; | 741 | struct timeval tm; |
742 | } v; | 742 | } v; |
743 | 743 | ||
744 | unsigned int lv = sizeof(int); | 744 | int lv = sizeof(int); |
745 | int len; | 745 | int len; |
746 | 746 | ||
747 | if (get_user(len, optlen)) | 747 | if (get_user(len, optlen)) |
@@ -2140,13 +2140,13 @@ int sock_prot_inuse_get(struct net *net, struct proto *prot) | |||
2140 | } | 2140 | } |
2141 | EXPORT_SYMBOL_GPL(sock_prot_inuse_get); | 2141 | EXPORT_SYMBOL_GPL(sock_prot_inuse_get); |
2142 | 2142 | ||
2143 | static int sock_inuse_init_net(struct net *net) | 2143 | static int __net_init sock_inuse_init_net(struct net *net) |
2144 | { | 2144 | { |
2145 | net->core.inuse = alloc_percpu(struct prot_inuse); | 2145 | net->core.inuse = alloc_percpu(struct prot_inuse); |
2146 | return net->core.inuse ? 0 : -ENOMEM; | 2146 | return net->core.inuse ? 0 : -ENOMEM; |
2147 | } | 2147 | } |
2148 | 2148 | ||
2149 | static void sock_inuse_exit_net(struct net *net) | 2149 | static void __net_exit sock_inuse_exit_net(struct net *net) |
2150 | { | 2150 | { |
2151 | free_percpu(net->core.inuse); | 2151 | free_percpu(net->core.inuse); |
2152 | } | 2152 | } |