X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fdecnet%2Faf_decnet.c;h=fc2efe899e9104fe9f91a8deb4bb28974dbb4381;hb=d9cadb0d2ffed847851945a66e80d0b9d767611c;hp=23fd95a7ad15bc758f1335d46d451b291268bffd;hpb=06802a819a0a2d31c952c0624cea6cd00e4e50da;p=linux-2.6

diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index 23fd95a7ad..fc2efe899e 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -1094,7 +1094,7 @@ static int dn_accept(struct socket *sock, struct socket *newsock, int flags)
 
 	cb = DN_SKB_CB(skb);
 	sk->sk_ack_backlog--;
-	newsk = dn_alloc_sock(sk->sk_net, newsock, sk->sk_allocation);
+	newsk = dn_alloc_sock(sock_net(sk), newsock, sk->sk_allocation);
 	if (newsk == NULL) {
 		release_sock(sk);
 		kfree_skb(skb);
@@ -2089,7 +2089,7 @@ static int dn_device_event(struct notifier_block *this, unsigned long event,
 {
 	struct net_device *dev = (struct net_device *)ptr;
 
-	if (dev->nd_net != &init_net)
+	if (dev_net(dev) != &init_net)
 		return NOTIFY_DONE;
 
 	switch(event) {