diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-25 05:37:07 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-25 05:37:07 -0400 |
| commit | 0e2f65ee30eee2db054f7fd73f462c5da33ec963 (patch) | |
| tree | 26c61eb7745da0c0d9135e9d12088f570cb8530d /net/atm/mpc.c | |
| parent | da7878d75b8520c9ae00d27dfbbce546a7bfdfbb (diff) | |
| parent | fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 (diff) | |
Merge branch 'linus' into x86/pebs
Conflicts:
arch/x86/Kconfig.cpu
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/setup_64.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)) |