diff options
Diffstat (limited to 'net/ipv6/inet6_hashtables.c')
| -rw-r--r-- | net/ipv6/inet6_hashtables.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c index 99fd25f7f005..580014aea4d6 100644 --- a/net/ipv6/inet6_hashtables.c +++ b/net/ipv6/inet6_hashtables.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | void __inet6_hash(struct sock *sk) | 25 | void __inet6_hash(struct sock *sk) |
| 26 | { | 26 | { |
| 27 | struct inet_hashinfo *hashinfo = sk->sk_prot->hashinfo; | 27 | struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo; |
| 28 | struct hlist_head *list; | 28 | struct hlist_head *list; |
| 29 | rwlock_t *lock; | 29 | rwlock_t *lock; |
| 30 | 30 | ||
| @@ -43,7 +43,7 @@ void __inet6_hash(struct sock *sk) | |||
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | __sk_add_node(sk, list); | 45 | __sk_add_node(sk, list); |
| 46 | sock_prot_inuse_add(sk->sk_prot, 1); | 46 | sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); |
| 47 | write_unlock(lock); | 47 | write_unlock(lock); |
| 48 | } | 48 | } |
| 49 | EXPORT_SYMBOL(__inet6_hash); | 49 | EXPORT_SYMBOL(__inet6_hash); |
| @@ -105,7 +105,7 @@ struct sock *inet6_lookup_listener(struct net *net, | |||
| 105 | 105 | ||
| 106 | read_lock(&hashinfo->lhash_lock); | 106 | read_lock(&hashinfo->lhash_lock); |
| 107 | sk_for_each(sk, node, &hashinfo->listening_hash[inet_lhashfn(hnum)]) { | 107 | sk_for_each(sk, node, &hashinfo->listening_hash[inet_lhashfn(hnum)]) { |
| 108 | if (sk->sk_net == net && inet_sk(sk)->num == hnum && | 108 | if (net_eq(sock_net(sk), net) && inet_sk(sk)->num == hnum && |
| 109 | sk->sk_family == PF_INET6) { | 109 | sk->sk_family == PF_INET6) { |
| 110 | const struct ipv6_pinfo *np = inet6_sk(sk); | 110 | const struct ipv6_pinfo *np = inet6_sk(sk); |
| 111 | 111 | ||
| @@ -172,7 +172,7 @@ static int __inet6_check_established(struct inet_timewait_death_row *death_row, | |||
| 172 | struct sock *sk2; | 172 | struct sock *sk2; |
| 173 | const struct hlist_node *node; | 173 | const struct hlist_node *node; |
| 174 | struct inet_timewait_sock *tw; | 174 | struct inet_timewait_sock *tw; |
| 175 | struct net *net = sk->sk_net; | 175 | struct net *net = sock_net(sk); |
| 176 | 176 | ||
| 177 | prefetch(head->chain.first); | 177 | prefetch(head->chain.first); |
| 178 | write_lock(lock); | 178 | write_lock(lock); |
| @@ -204,7 +204,7 @@ unique: | |||
| 204 | BUG_TRAP(sk_unhashed(sk)); | 204 | BUG_TRAP(sk_unhashed(sk)); |
| 205 | __sk_add_node(sk, &head->chain); | 205 | __sk_add_node(sk, &head->chain); |
| 206 | sk->sk_hash = hash; | 206 | sk->sk_hash = hash; |
| 207 | sock_prot_inuse_add(sk->sk_prot, 1); | 207 | sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); |
| 208 | write_unlock(lock); | 208 | write_unlock(lock); |
| 209 | 209 | ||
| 210 | if (twp != NULL) { | 210 | if (twp != NULL) { |