diff options
Diffstat (limited to 'net/ipv6/mcast.c')
-rw-r--r-- | net/ipv6/mcast.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 957ac7e9e929..0357de8e78c8 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c | |||
@@ -1400,7 +1400,7 @@ mld_scount(struct ifmcaddr6 *pmc, int type, int gdeleted, int sdeleted) | |||
1400 | 1400 | ||
1401 | static struct sk_buff *mld_newpack(struct net_device *dev, int size) | 1401 | static struct sk_buff *mld_newpack(struct net_device *dev, int size) |
1402 | { | 1402 | { |
1403 | struct net *net = dev->nd_net; | 1403 | struct net *net = dev_net(dev); |
1404 | struct sock *sk = net->ipv6.igmp_sk; | 1404 | struct sock *sk = net->ipv6.igmp_sk; |
1405 | struct sk_buff *skb; | 1405 | struct sk_buff *skb; |
1406 | struct mld2_report *pmr; | 1406 | struct mld2_report *pmr; |
@@ -1448,7 +1448,7 @@ static void mld_sendpack(struct sk_buff *skb) | |||
1448 | (struct mld2_report *)skb_transport_header(skb); | 1448 | (struct mld2_report *)skb_transport_header(skb); |
1449 | int payload_len, mldlen; | 1449 | int payload_len, mldlen; |
1450 | struct inet6_dev *idev = in6_dev_get(skb->dev); | 1450 | struct inet6_dev *idev = in6_dev_get(skb->dev); |
1451 | struct net *net = skb->dev->nd_net; | 1451 | struct net *net = dev_net(skb->dev); |
1452 | int err; | 1452 | int err; |
1453 | struct flowi fl; | 1453 | struct flowi fl; |
1454 | 1454 | ||
@@ -1762,7 +1762,7 @@ static void mld_send_cr(struct inet6_dev *idev) | |||
1762 | 1762 | ||
1763 | static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type) | 1763 | static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type) |
1764 | { | 1764 | { |
1765 | struct net *net = dev->nd_net; | 1765 | struct net *net = dev_net(dev); |
1766 | struct sock *sk = net->ipv6.igmp_sk; | 1766 | struct sock *sk = net->ipv6.igmp_sk; |
1767 | struct inet6_dev *idev; | 1767 | struct inet6_dev *idev; |
1768 | struct sk_buff *skb; | 1768 | struct sk_buff *skb; |