diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 17:17:34 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 17:17:34 +0100 |
| commit | cf816ecb533ab96b883dfdc0db174598b5b5c4d2 (patch) | |
| tree | 1b7705db288ae2917105e624b01fdf81e0882bf1 /net/can/raw.c | |
| parent | adf6d34e460387ee3e8f1e1875d52bff51212c7d (diff) | |
| parent | 15f7d677ccff6f0f5de8a1ee43a792567e9f9de9 (diff) | |
| download | kernel-crypto-cf816ecb533ab96b883dfdc0db174598b5b5c4d2.tar.gz kernel-crypto-cf816ecb533ab96b883dfdc0db174598b5b5c4d2.tar.xz kernel-crypto-cf816ecb533ab96b883dfdc0db174598b5b5c4d2.zip | |
Merge branch 'merge-fixes' into devel
Diffstat (limited to 'net/can/raw.c')
| -rw-r--r-- | net/can/raw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/can/raw.c b/net/can/raw.c index 94cd7f27c44..ead50c7c0d4 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -210,7 +210,7 @@ static int raw_notifier(struct notifier_block *nb, struct raw_sock *ro = container_of(nb, struct raw_sock, notifier); struct sock *sk = &ro->sk; - if (dev->nd_net != &init_net) + if (dev_net(dev) != &init_net) return NOTIFY_DONE; if (dev->type != ARPHRD_CAN) |