diff options
Diffstat (limited to 'net/ipv6/ipv6_sockglue.c')
| -rw-r--r-- | net/ipv6/ipv6_sockglue.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index d3d93d752e10..4195ac92345e 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c | |||
| @@ -155,10 +155,11 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, | |||
| 155 | 155 | ||
| 156 | if (sk->sk_protocol == IPPROTO_TCP) { | 156 | if (sk->sk_protocol == IPPROTO_TCP) { |
| 157 | struct inet_connection_sock *icsk = inet_csk(sk); | 157 | struct inet_connection_sock *icsk = inet_csk(sk); |
| 158 | struct net *net = sock_net(sk); | ||
| 158 | 159 | ||
| 159 | local_bh_disable(); | 160 | local_bh_disable(); |
| 160 | sock_prot_inuse_add(sk->sk_prot, -1); | 161 | sock_prot_inuse_add(net, sk->sk_prot, -1); |
| 161 | sock_prot_inuse_add(&tcp_prot, 1); | 162 | sock_prot_inuse_add(net, &tcp_prot, 1); |
| 162 | local_bh_enable(); | 163 | local_bh_enable(); |
| 163 | sk->sk_prot = &tcp_prot; | 164 | sk->sk_prot = &tcp_prot; |
| 164 | icsk->icsk_af_ops = &ipv4_specific; | 165 | icsk->icsk_af_ops = &ipv4_specific; |
| @@ -167,12 +168,13 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, | |||
| 167 | tcp_sync_mss(sk, icsk->icsk_pmtu_cookie); | 168 | tcp_sync_mss(sk, icsk->icsk_pmtu_cookie); |
| 168 | } else { | 169 | } else { |
| 169 | struct proto *prot = &udp_prot; | 170 | struct proto *prot = &udp_prot; |
| 171 | struct net *net = sock_net(sk); | ||
| 170 | 172 | ||
| 171 | if (sk->sk_protocol == IPPROTO_UDPLITE) | 173 | if (sk->sk_protocol == IPPROTO_UDPLITE) |
| 172 | prot = &udplite_prot; | 174 | prot = &udplite_prot; |
| 173 | local_bh_disable(); | 175 | local_bh_disable(); |
| 174 | sock_prot_inuse_add(sk->sk_prot, -1); | 176 | sock_prot_inuse_add(net, sk->sk_prot, -1); |
| 175 | sock_prot_inuse_add(prot, 1); | 177 | sock_prot_inuse_add(net, prot, 1); |
| 176 | local_bh_enable(); | 178 | local_bh_enable(); |
| 177 | sk->sk_prot = prot; | 179 | sk->sk_prot = prot; |
| 178 | sk->sk_socket->ops = &inet_dgram_ops; | 180 | sk->sk_socket->ops = &inet_dgram_ops; |