diff options
author | David S. Miller <davem@davemloft.net> | 2008-03-26 02:43:59 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-26 02:43:59 (GMT) |
commit | dfe98e9214ced45cd1a6ecd19f2627819a630f77 (patch) | |
tree | 4a229937bc32c470ebb75a51bdd39572d91ac0ce /arch | |
parent | f89e6e3834035c6e8203042f3527931aa7f52496 (diff) | |
parent | 878628fbf2589eb24357e42027d5f54b1dafd3c8 (diff) | |
download | linux-fsl-qoriq-dfe98e9214ced45cd1a6ecd19f2627819a630f77.tar.xz |
Merge branch 'net-2.6.26-netns-20080326' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-dev
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/hp/sim/simeth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c index 969fe9f4..3d47839 100644 --- a/arch/ia64/hp/sim/simeth.c +++ b/arch/ia64/hp/sim/simeth.c @@ -294,7 +294,7 @@ simeth_device_event(struct notifier_block *this,unsigned long event, void *ptr) return NOTIFY_DONE; } - if (dev->nd_net != &init_net) + if (dev_net(dev) != &init_net) return NOTIFY_DONE; if ( event != NETDEV_UP && event != NETDEV_DOWN ) return NOTIFY_DONE; |