diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-05 16:01:51 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-05 16:01:51 -0800 |
| commit | c276e098d3ee33059b4a1c747354226cec58487c (patch) | |
| tree | df833d2e6719dd83f219a846520a581b152d5332 /net/core | |
| parent | 7945cc6464a4db0caf6dfacdfe05806051c4cb7b (diff) | |
| download | op-kernel-dev-c276e098d3ee33059b4a1c747354226cec58487c.zip op-kernel-dev-c276e098d3ee33059b4a1c747354226cec58487c.tar.gz | |
Revert "net: Fix for initial link state in 2.6.28"
This reverts commit 22604c866889c4b2e12b73cbf1683bda1b72a313.
We can't fix this issue in this way, because we now can try
to take the dev_base_lock rwlock as a writer in software interrupt
context and that is not allowed without major surgery elsewhere.
This initial link state problem needs to be solved in some other
way.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/link_watch.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/core/link_watch.c b/net/core/link_watch.c index 1e401e1..bf8f7af 100644 --- a/net/core/link_watch.c +++ b/net/core/link_watch.c @@ -178,6 +178,7 @@ static void __linkwatch_run_queue(int urgent_only) */ clear_bit(__LINK_STATE_LINKWATCH_PENDING, &dev->state); + rfc2863_policy(dev); if (dev->flags & IFF_UP) { if (netif_carrier_ok(dev)) dev_activate(dev); @@ -214,12 +215,6 @@ void linkwatch_fire_event(struct net_device *dev) { bool urgent = linkwatch_urgent_event(dev); - rfc2863_policy(dev); - - /* Some drivers call netif_carrier_off early */ - if (dev->reg_state == NETREG_UNINITIALIZED) - return; - if (!test_and_set_bit(__LINK_STATE_LINKWATCH_PENDING, &dev->state)) { dev_hold(dev); |
