diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 15:06:09 +0200 | 
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 15:06:09 +0200 | 
| commit | e66d90fb4abd0a27ee96f57a32fb561221c4d6ae (patch) | |
| tree | 3337cba94c7444b06fdb0e8b487287d07b71f4a0 /net/can/raw.c | |
| parent | 55ca089e2579de90f048aca2a3030b8b2f864813 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into xen-64bit
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 3e46ee36a1aa..6e0663faaf9f 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_net(dev) != &init_net) +	if (!net_eq(dev_net(dev), &init_net))  		return NOTIFY_DONE;  	if (dev->type != ARPHRD_CAN)  | 
