diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-12-10 20:58:37 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-29 00:06:35 +0100 |
| commit | 4f679496567809ce1e95730c25274e1832537f4b (patch) | |
| tree | e46717a8df0eda9e741098ddaf56b7e1c36ab580 /drivers/net/wireless/libertas/if_usb.c | |
| parent | libertas: add opaque extra argument to cmd callback function (diff) | |
| download | linux-4f679496567809ce1e95730c25274e1832537f4b.tar.xz linux-4f679496567809ce1e95730c25274e1832537f4b.zip | |
libertas: clean up lbs_interrupt()
Make it take struct lbs_private as argument; that's all it wants anyway,
and all callers were starting off from that. Don't wake the netif
queues, because those should be handled elsewhere. And sort out the
locking, with a big nasty warning for those who don't have the
driver_lock locked when they call it.
Oh, and fix if_cs.c to lock the driver_lock before calling it.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/if_usb.c')
| -rw-r--r-- | drivers/net/wireless/libertas/if_usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index f59fd73468fc..1c23166783f4 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c @@ -632,7 +632,7 @@ static inline void process_cmdrequest(int recvlength, u8 *recvbuff, priv->upld_len); kfree_skb(skb); - lbs_interrupt(priv->dev); + lbs_interrupt(priv); spin_unlock(&priv->driver_lock); lbs_deb_usbd(&cardp->udev->dev, @@ -705,7 +705,7 @@ static void if_usb_receive(struct urb *urb) cardp->usb_event_cause <<= 3; cardp->usb_int_cause |= MRVDRV_CARDEVENT; kfree_skb(skb); - lbs_interrupt(priv->dev); + lbs_interrupt(priv); spin_unlock(&priv->driver_lock); goto rx_exit; default: |