diff options
| author | Jie Yang <jie.yang@atheros.com> | 2009-12-07 00:16:58 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-09 05:48:07 +0100 |
| commit | cb19054697e92a793f336380fd72c588521178ff (patch) | |
| tree | e6bbbec3688aba8fb68eb54674e3f67a4c1f49d8 /drivers/net/atl1c/atl1c.h | |
| parent | atl1c:add pci map direction in atl1c_buffer flags (diff) | |
| download | linux-cb19054697e92a793f336380fd72c588521178ff.tar.xz linux-cb19054697e92a793f336380fd72c588521178ff.zip | |
atl1c:use common_task instead of reset_task and link_chg_task
use common_task instead of reset_task and link_chg_task, so it fix "call cancel_work_sync
from the work itself".
Signed-off-by: Jie Yang <jie.yang@atheros.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/atl1c/atl1c.h')
| -rw-r--r-- | drivers/net/atl1c/atl1c.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/atl1c/atl1c.h b/drivers/net/atl1c/atl1c.h index 7e09084f75a9..efe5435bc3d3 100644 --- a/drivers/net/atl1c/atl1c.h +++ b/drivers/net/atl1c/atl1c.h @@ -555,6 +555,9 @@ struct atl1c_adapter { #define __AT_TESTING 0x0001 #define __AT_RESETTING 0x0002 #define __AT_DOWN 0x0003 + u8 work_event; +#define ATL1C_WORK_EVENT_RESET 0x01 +#define ATL1C_WORK_EVENT_LINK_CHANGE 0x02 u32 msg_enable; bool have_msi; @@ -566,8 +569,7 @@ struct atl1c_adapter { spinlock_t tx_lock; atomic_t irq_sem; - struct work_struct reset_task; - struct work_struct link_chg_task; + struct work_struct common_task; struct timer_list watchdog_timer; struct timer_list phy_config_timer; |