Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02353573 authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by John W. Linville
Browse files

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: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2fc713b2

drivers/net/wireless/zd1211rw/zd_usb.c

+13 −1
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@ static void rx_urb_complete(struct urb *urb) 
	usb = urb->context;

	rx = &usb->rx;



	zd_usb_reset_rx_idle_timer(usb);

	tasklet_schedule(&rx->reset_timer_tasklet);



	if (length%rx->usb_packet_size > rx->usb_packet_size-4) {

		/* If there is an old first fragment, we don't care. */
@@ -812,6 +812,7 @@ void zd_usb_disable_rx(struct zd_usb *usb) 
	__zd_usb_disable_rx(usb);

	mutex_unlock(&rx->setup_mutex);



	tasklet_kill(&rx->reset_timer_tasklet);

	cancel_delayed_work_sync(&rx->idle_work);

}
@@ -1106,6 +1107,13 @@ static void zd_rx_idle_timer_handler(struct work_struct *work) 
	zd_usb_reset_rx(usb);

}



static void zd_usb_reset_rx_idle_timer_tasklet(unsigned long param)

{

	struct zd_usb *usb = (struct zd_usb *)param;



	zd_usb_reset_rx_idle_timer(usb);

}



void zd_usb_reset_rx_idle_timer(struct zd_usb *usb)

{

	struct zd_usb_rx *rx = &usb->rx;
@@ -1127,6 +1135,7 @@ static inline void init_usb_interrupt(struct zd_usb *usb) 
static inline void init_usb_rx(struct zd_usb *usb)

{

	struct zd_usb_rx *rx = &usb->rx;



	spin_lock_init(&rx->lock);

	mutex_init(&rx->setup_mutex);

	if (interface_to_usbdev(usb->intf)->speed == USB_SPEED_HIGH) {
@@ -1136,11 +1145,14 @@ static inline void init_usb_rx(struct zd_usb *usb) 
	}

	ZD_ASSERT(rx->fragment_length == 0);

	INIT_DELAYED_WORK(&rx->idle_work, zd_rx_idle_timer_handler);

	rx->reset_timer_tasklet.func = zd_usb_reset_rx_idle_timer_tasklet;

	rx->reset_timer_tasklet.data = (unsigned long)usb;

}



static inline void init_usb_tx(struct zd_usb *usb)

{

	struct zd_usb_tx *tx = &usb->tx;



	spin_lock_init(&tx->lock);

	atomic_set(&tx->enabled, 0);

	tx->stopped = 0;

drivers/net/wireless/zd1211rw/zd_usb.h

+1 −0
Original line number Diff line number Diff line
@@ -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;