diff options
| author | Christian Lamparter <chunkeey@web.de> | 2009-04-25 21:12:09 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-05-06 15:14:41 -0400 |
| commit | 1ca5f2e94c40b04d5dec437cd41fd5ba12aaac31 (patch) | |
| tree | 7aff5fa8798e8d4e4cb90ba2e516ad01e4575167 /drivers/net/wireless/p54/p54usb.h | |
| parent | a406ac0dc15b22807b65f5a6590b9cb34d99d4ab (diff) | |
| download | linux-1ca5f2e94c40b04d5dec437cd41fd5ba12aaac31.tar.gz linux-1ca5f2e94c40b04d5dec437cd41fd5ba12aaac31.tar.bz2 linux-1ca5f2e94c40b04d5dec437cd41fd5ba12aaac31.zip | |
p54usb: rework driver for resume
This patch redo the driver code so that p54usb no longer hangs
the kernel on resume.
Signed-off-by: Christian Lamparter <chunkeey@web.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/p54/p54usb.h')
| -rw-r--r-- | drivers/net/wireless/p54/p54usb.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/net/wireless/p54/p54usb.h b/drivers/net/wireless/p54/p54usb.h index 8bc58982d8dd..e935b79f7f75 100644 --- a/drivers/net/wireless/p54/p54usb.h +++ b/drivers/net/wireless/p54/p54usb.h @@ -123,18 +123,26 @@ struct p54u_rx_info { struct ieee80211_hw *dev; }; +enum p54u_hw_type { + P54U_INVALID_HW, + P54U_NET2280, + P54U_3887, + + /* keep last */ + __NUM_P54U_HWTYPES, +}; + struct p54u_priv { struct p54_common common; struct usb_device *udev; struct usb_interface *intf; - enum { - P54U_NET2280 = 0, - P54U_3887 - } hw_type; + int (*upload_fw)(struct ieee80211_hw *dev); + enum p54u_hw_type hw_type; spinlock_t lock; struct sk_buff_head rx_queue; struct usb_anchor submitted; + const struct firmware *fw; }; #endif /* P54USB_H */ |