X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fcan%2Faf_can.c;h=8035fbf526ae24e5fabff5b1c588abb8769e3c67;hb=9ea319b61613085f501a79cf8d405cb221d084f3;hp=484bbf6dd0322790f6f42cee71c3e1f86f6ace41;hpb=a26449daa285c858fc68991c1d585b6927702cf5;p=linux-2.6 diff --git a/net/can/af_can.c b/net/can/af_can.c index 484bbf6dd0..8035fbf526 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -615,7 +615,7 @@ static int can_rcv(struct sk_buff *skb, struct net_device *dev, struct can_frame *cf = (struct can_frame *)skb->data; int matches; - if (dev->type != ARPHRD_CAN || dev_net(dev) != &init_net) { + if (dev->type != ARPHRD_CAN || !net_eq(dev_net(dev), &init_net)) { kfree_skb(skb); return 0; } @@ -728,7 +728,7 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg, struct net_device *dev = (struct net_device *)data; struct dev_rcv_lists *d; - if (dev_net(dev) != &init_net) + if (!net_eq(dev_net(dev), &init_net)) return NOTIFY_DONE; if (dev->type != ARPHRD_CAN)