diff options
Diffstat (limited to 'net/ipv4/ip_sockglue.c')
-rw-r--r-- | net/ipv4/ip_sockglue.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index b854431047a4..d6e76f5229cc 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c | |||
@@ -449,7 +449,7 @@ static int do_ip_setsockopt(struct sock *sk, int level, | |||
449 | struct ip_options * opt = NULL; | 449 | struct ip_options * opt = NULL; |
450 | if (optlen > 40 || optlen < 0) | 450 | if (optlen > 40 || optlen < 0) |
451 | goto e_inval; | 451 | goto e_inval; |
452 | err = ip_options_get_from_user(sk->sk_net, &opt, | 452 | err = ip_options_get_from_user(sock_net(sk), &opt, |
453 | optval, optlen); | 453 | optval, optlen); |
454 | if (err) | 454 | if (err) |
455 | break; | 455 | break; |
@@ -590,13 +590,13 @@ static int do_ip_setsockopt(struct sock *sk, int level, | |||
590 | err = 0; | 590 | err = 0; |
591 | break; | 591 | break; |
592 | } | 592 | } |
593 | dev = ip_dev_find(sk->sk_net, mreq.imr_address.s_addr); | 593 | dev = ip_dev_find(sock_net(sk), mreq.imr_address.s_addr); |
594 | if (dev) { | 594 | if (dev) { |
595 | mreq.imr_ifindex = dev->ifindex; | 595 | mreq.imr_ifindex = dev->ifindex; |
596 | dev_put(dev); | 596 | dev_put(dev); |
597 | } | 597 | } |
598 | } else | 598 | } else |
599 | dev = __dev_get_by_index(sk->sk_net, mreq.imr_ifindex); | 599 | dev = __dev_get_by_index(sock_net(sk), mreq.imr_ifindex); |
600 | 600 | ||
601 | 601 | ||
602 | err = -EADDRNOTAVAIL; | 602 | err = -EADDRNOTAVAIL; |