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>

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 */