diff options
Diffstat (limited to 'include/net/sock.h')
-rw-r--r-- | include/net/sock.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 9ef8b5fb7936..74e1f7d90d73 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -56,6 +56,7 @@ | |||
56 | #include <asm/atomic.h> | 56 | #include <asm/atomic.h> |
57 | #include <net/dst.h> | 57 | #include <net/dst.h> |
58 | #include <net/checksum.h> | 58 | #include <net/checksum.h> |
59 | #include <net/net_namespace.h> | ||
59 | 60 | ||
60 | /* | 61 | /* |
61 | * This structure really needs to be cleaned up. | 62 | * This structure really needs to be cleaned up. |
@@ -776,7 +777,7 @@ extern void FASTCALL(release_sock(struct sock *sk)); | |||
776 | SINGLE_DEPTH_NESTING) | 777 | SINGLE_DEPTH_NESTING) |
777 | #define bh_unlock_sock(__sk) spin_unlock(&((__sk)->sk_lock.slock)) | 778 | #define bh_unlock_sock(__sk) spin_unlock(&((__sk)->sk_lock.slock)) |
778 | 779 | ||
779 | extern struct sock *sk_alloc(int family, | 780 | extern struct sock *sk_alloc(struct net *net, int family, |
780 | gfp_t priority, | 781 | gfp_t priority, |
781 | struct proto *prot, int zero_it); | 782 | struct proto *prot, int zero_it); |
782 | extern void sk_free(struct sock *sk); | 783 | extern void sk_free(struct sock *sk); |
@@ -1005,6 +1006,7 @@ static inline void sock_copy(struct sock *nsk, const struct sock *osk) | |||
1005 | #endif | 1006 | #endif |
1006 | 1007 | ||
1007 | memcpy(nsk, osk, osk->sk_prot->obj_size); | 1008 | memcpy(nsk, osk, osk->sk_prot->obj_size); |
1009 | get_net(nsk->sk_net); | ||
1008 | #ifdef CONFIG_SECURITY_NETWORK | 1010 | #ifdef CONFIG_SECURITY_NETWORK |
1009 | nsk->sk_security = sptr; | 1011 | nsk->sk_security = sptr; |
1010 | security_sk_clone(osk, nsk); | 1012 | security_sk_clone(osk, nsk); |