diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-06 01:01:51 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-06 01:01:51 +0100 |
| commit | c276e098d3ee33059b4a1c747354226cec58487c (patch) | |
| tree | df833d2e6719dd83f219a846520a581b152d5332 /net/sched | |
| parent | tcp: Kill extraneous SPLICE_F_NONBLOCK checks. (diff) | |
| download | linux-c276e098d3ee33059b4a1c747354226cec58487c.tar.xz linux-c276e098d3ee33059b4a1c747354226cec58487c.zip | |
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/sched')
| -rw-r--r-- | net/sched/sch_generic.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 23a8e6141a00..5f5efe4e6072 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -270,6 +270,8 @@ static void dev_watchdog_down(struct net_device *dev) void netif_carrier_on(struct net_device *dev) { if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state)) { + if (dev->reg_state == NETREG_UNINITIALIZED) + return; linkwatch_fire_event(dev); if (netif_running(dev)) __netdev_watchdog_up(dev); @@ -286,6 +288,8 @@ EXPORT_SYMBOL(netif_carrier_on); void netif_carrier_off(struct net_device *dev) { if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state)) { + if (dev->reg_state == NETREG_UNINITIALIZED) + return; linkwatch_fire_event(dev); } } |