projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[cascardo/linux.git]
/
net
/
can
/
bcm.c
diff --git
a/net/can/bcm.c
b/net/can/bcm.c
index
bd4282d
..
e9f99b2
100644
(file)
--- a/
net/can/bcm.c
+++ b/
net/can/bcm.c
@@
-1285,7
+1285,7
@@
static int bcm_notifier(struct notifier_block *nb, unsigned long msg,
struct bcm_op *op;
int notify_enodev = 0;
- if (dev
->nd_net
!= &init_net)
+ if (dev
_net(dev)
!= &init_net)
return NOTIFY_DONE;
if (dev->type != ARPHRD_CAN)