diff options
| author | Jonathan DE CESCO <jonathan.de.cesco@intel.com> | 2012-04-18 17:41:52 +0200 |
|---|---|---|
| committer | buildbot <buildbot@intel.com> | 2012-04-24 16:58:05 -0700 |
| commit | 01015a222b2722c2a2a4c9baacf619fc8e7ffe22 (patch) | |
| tree | 82cbf93e0f61ce5f07cf44b8281e377bb8369ca7 | |
| parent | 814eae459521ec8b1f46d98e94f9ca1a7a324590 (diff) | |
| download | kernel-mfld-blackbay-01015a222b2722c2a2a4c9baacf619fc8e7ffe22.tar.gz kernel-mfld-blackbay-01015a222b2722c2a2a4c9baacf619fc8e7ffe22.tar.bz2 kernel-mfld-blackbay-01015a222b2722c2a2a4c9baacf619fc8e7ffe22.zip | |
net/core: fix rollback handler in register_netdevice_notifier
BZ: 31995
Coming from upstream commit 8f891489866ec62a87494eff3ed17c88152c32d4
"Within nested statements, the break statement terminates only the
do, for, switch, or while statement that immediately encloses it,
So replace the break with goto."
Change-Id: I5c11e8fb4424cd2418da3b14eab02a55cea8a719
Signed-off-by: RongQing.Li <roy.qing.li@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jonathan DE CESCO <jonathan.de.cesco@intel.com>
Reviewed-on: http://android.intel.com:8080/43912
Reviewed-by: Zayet, AymenX <aymenx.zayet@intel.com>
Reviewed-by: Jarzmik, Robert <robert.jarzmik@intel.com>
Reviewed-by: Regairaz, JulieX <juliex.regairaz@intel.com>
Reviewed-by: Koskinen, Ilkka <ilkka.koskinen@intel.com>
Reviewed-by: Yang, Fei <fei.yang@intel.com>
Reviewed-by: Gross, Mark <mark.gross@intel.com>
Reviewed-by: Monroy, German <german.monroy@intel.com>
Tested-by: Ng, Cheon-woei <cheon-woei.ng@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 9c58c1ec41a..6b057af277d 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1382,7 +1382,7 @@ rollback: for_each_net(net) { for_each_netdev(net, dev) { if (dev == last) - break; + goto outroll; if (dev->flags & IFF_UP) { nb->notifier_call(nb, NETDEV_GOING_DOWN, dev); @@ -1393,6 +1393,7 @@ rollback: } } +outroll: raw_notifier_chain_unregister(&netdev_chain, nb); goto unlock; } |