diff options
| author | Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2011-04-01 19:34:16 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-04 15:22:12 -0400 |
| commit | 023535732f4db01af4921f20f058bc4561d9add7 (patch) | |
| tree | fc4cf7aa28a7ba81a115f41052f71e08fee7b5cd /drivers/net/wireless/zd1211rw/zd_usb.h | |
| parent | 2fc713b20469b2779fa89f582d2a9696b10031e7 (diff) | |
| download | op-kernel-dev-023535732f4db01af4921f20f058bc4561d9add7.zip op-kernel-dev-023535732f4db01af4921f20f058bc4561d9add7.tar.gz | |
zd1211rw: reset rx idle timer from tasklet
2.6.38 added WARN_ON(in_irq) in del_timer_sync that triggers on zd1211rw when
reseting rx idle timer in urb completion handler.
Move timer reseting to tasklet.
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_usb.h')
| -rw-r--r-- | drivers/net/wireless/zd1211rw/zd_usb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.h b/drivers/net/wireless/zd1211rw/zd_usb.h index b3df2c8..325d0f9 100644 --- a/drivers/net/wireless/zd1211rw/zd_usb.h +++ b/drivers/net/wireless/zd1211rw/zd_usb.h @@ -183,6 +183,7 @@ struct zd_usb_rx { spinlock_t lock; struct mutex setup_mutex; struct delayed_work idle_work; + struct tasklet_struct reset_timer_tasklet; u8 fragment[2 * USB_MAX_RX_SIZE]; unsigned int fragment_length; unsigned int usb_packet_size; |
