diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:19:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:19:50 -0400 |
| commit | eb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0 (patch) | |
| tree | 5ac6f43899648abeab1d43aad3107f664e7f13d5 /net/atm/mpc.c | |
| parent | c4762aba0b1f72659aae9ce37b772ca8bd8f06f4 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into cpus4096-for-linus
Conflicts:
net/sunrpc/svc.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/atm/mpc.c')
| -rw-r--r-- | net/atm/mpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/atm/mpc.c b/net/atm/mpc.c index 9db332e7a6c0..4fccaa1e07be 100644 --- a/net/atm/mpc.c +++ b/net/atm/mpc.c | |||
| @@ -964,7 +964,7 @@ static int mpoa_event_listener(struct notifier_block *mpoa_notifier, unsigned lo | |||
| 964 | 964 | ||
| 965 | dev = (struct net_device *)dev_ptr; | 965 | dev = (struct net_device *)dev_ptr; |
| 966 | 966 | ||
| 967 | if (dev_net(dev) != &init_net) | 967 | if (!net_eq(dev_net(dev), &init_net)) |
| 968 | return NOTIFY_DONE; | 968 | return NOTIFY_DONE; |
| 969 | 969 | ||
| 970 | if (dev->name == NULL || strncmp(dev->name, "lec", 3)) | 970 | if (dev->name == NULL || strncmp(dev->name, "lec", 3)) |