aboutsummaryrefslogtreecommitdiffstats
path: root/net/x25/af_x25.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/x25/af_x25.c')
-rw-r--r--net/x25/af_x25.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 339ca4a8e89e..6ba67c523c16 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -191,7 +191,7 @@ static int x25_device_event(struct notifier_block *this, unsigned long event,
191 struct net_device *dev = ptr; 191 struct net_device *dev = ptr;
192 struct x25_neigh *nb; 192 struct x25_neigh *nb;
193 193
194 if (dev->nd_net != &init_net) 194 if (dev_net(dev) != &init_net)
195 return NOTIFY_DONE; 195 return NOTIFY_DONE;
196 196
197 if (dev->type == ARPHRD_X25 197 if (dev->type == ARPHRD_X25
@@ -549,7 +549,7 @@ static struct sock *x25_make_new(struct sock *osk)
549 if (osk->sk_type != SOCK_SEQPACKET) 549 if (osk->sk_type != SOCK_SEQPACKET)
550 goto out; 550 goto out;
551 551
552 if ((sk = x25_alloc_socket(osk->sk_net)) == NULL) 552 if ((sk = x25_alloc_socket(sock_net(osk))) == NULL)
553 goto out; 553 goto out;
554 554
555 x25 = x25_sk(sk); 555 x25 = x25_sk(sk);