diff options
Diffstat (limited to 'net/decnet/dn_route.c')
-rw-r--r-- | net/decnet/dn_route.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 9dc0abb50eaf..2f665a516476 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c | |||
@@ -580,7 +580,7 @@ int dn_route_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type | |||
580 | struct dn_dev *dn = (struct dn_dev *)dev->dn_ptr; | 580 | struct dn_dev *dn = (struct dn_dev *)dev->dn_ptr; |
581 | unsigned char padlen = 0; | 581 | unsigned char padlen = 0; |
582 | 582 | ||
583 | if (dev->nd_net != &init_net) | 583 | if (dev_net(dev) != &init_net) |
584 | goto dump_it; | 584 | goto dump_it; |
585 | 585 | ||
586 | if (dn == NULL) | 586 | if (dn == NULL) |
@@ -1512,7 +1512,7 @@ rtattr_failure: | |||
1512 | */ | 1512 | */ |
1513 | static int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, void *arg) | 1513 | static int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, void *arg) |
1514 | { | 1514 | { |
1515 | struct net *net = in_skb->sk->sk_net; | 1515 | struct net *net = sock_net(in_skb->sk); |
1516 | struct rtattr **rta = arg; | 1516 | struct rtattr **rta = arg; |
1517 | struct rtmsg *rtm = NLMSG_DATA(nlh); | 1517 | struct rtmsg *rtm = NLMSG_DATA(nlh); |
1518 | struct dn_route *rt = NULL; | 1518 | struct dn_route *rt = NULL; |
@@ -1601,7 +1601,7 @@ out_free: | |||
1601 | */ | 1601 | */ |
1602 | int dn_cache_dump(struct sk_buff *skb, struct netlink_callback *cb) | 1602 | int dn_cache_dump(struct sk_buff *skb, struct netlink_callback *cb) |
1603 | { | 1603 | { |
1604 | struct net *net = skb->sk->sk_net; | 1604 | struct net *net = sock_net(skb->sk); |
1605 | struct dn_route *rt; | 1605 | struct dn_route *rt; |
1606 | int h, s_h; | 1606 | int h, s_h; |
1607 | int idx, s_idx; | 1607 | int idx, s_idx; |