diff options
Diffstat (limited to 'net/rose/af_rose.c')
-rw-r--r-- | net/rose/af_rose.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index 063cbc5c26b1..d1ff3f885c5d 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c | |||
@@ -197,7 +197,7 @@ static int rose_device_event(struct notifier_block *this, unsigned long event, | |||
197 | { | 197 | { |
198 | struct net_device *dev = (struct net_device *)ptr; | 198 | struct net_device *dev = (struct net_device *)ptr; |
199 | 199 | ||
200 | if (dev->nd_net != &init_net) | 200 | if (dev_net(dev) != &init_net) |
201 | return NOTIFY_DONE; | 201 | return NOTIFY_DONE; |
202 | 202 | ||
203 | if (event != NETDEV_DOWN) | 203 | if (event != NETDEV_DOWN) |
@@ -551,7 +551,7 @@ static struct sock *rose_make_new(struct sock *osk) | |||
551 | if (osk->sk_type != SOCK_SEQPACKET) | 551 | if (osk->sk_type != SOCK_SEQPACKET) |
552 | return NULL; | 552 | return NULL; |
553 | 553 | ||
554 | sk = sk_alloc(osk->sk_net, PF_ROSE, GFP_ATOMIC, &rose_proto); | 554 | sk = sk_alloc(sock_net(osk), PF_ROSE, GFP_ATOMIC, &rose_proto); |
555 | if (sk == NULL) | 555 | if (sk == NULL) |
556 | return NULL; | 556 | return NULL; |
557 | 557 | ||