diff options
| author | stephen hemminger <shemminger@vyatta.com> | 2011-07-22 14:53:56 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-23 02:01:14 +0200 |
| commit | 1821f7cd65ad9ea56580b830ac79bf4c4fef59cb (patch) | |
| tree | cc483748bed6b3748ccece6c26d1c8a334bd0ba4 /net | |
| parent | bna: Header File Consolidation (diff) | |
| download | linux-1821f7cd65ad9ea56580b830ac79bf4c4fef59cb.tar.xz linux-1821f7cd65ad9ea56580b830ac79bf4c4fef59cb.zip | |
net: allow netif_carrier to be called safely from IRQ
As reported by Ben Greer and Froncois Romieu. The code path in
the netif_carrier code leads it to try and disable
a late workqueue to reenable it immediately
netif_carrier_on
-> linkwatch_fire_event
-> linkwatch_schedule_work
-> cancel_delayed_work
-> del_timer_sync
If __cancel_delayed_work is used instead then there is no
problem of waiting for running linkwatch_event.
There is a race between linkwatch_event running re-scheduling
but it is harmless to schedule an extra scan of the linkwatch queue.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/link_watch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/link_watch.c b/net/core/link_watch.c index a7b342131869..357bd4ee4baa 100644 --- a/net/core/link_watch.c +++ b/net/core/link_watch.c @@ -126,7 +126,7 @@ static void linkwatch_schedule_work(int urgent) return; /* It's already running which is good enough. */ - if (!cancel_delayed_work(&linkwatch_work)) + if (!__cancel_delayed_work(&linkwatch_work)) return; /* Otherwise we reschedule it again for immediate execution. */ |