From bb0a2bb3bc7b709a8b52cd73deb859c907eaf431 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Tue, 11 Dec 2007 12:53:43 -0500
Subject: [PATCH] --- yaml --- r: 79163 b: refs/heads/master c:
 6bc822b5164e66ab9b93f96172df8902bfd37618 h: refs/heads/master i:   79161:
 ddbb706999d1a17edbdfcc155836777d22d24687   79159:
 a472d37aa6109d0e81a905cd8dd21370aa5b5915 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/libertas/if_usb.c | 2 +-
 trunk/drivers/net/wireless/libertas/if_usb.h | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ffb069c4389b..7dfe2f8078fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e66f03ff78b23d845920739373b1561c546b13f
+refs/heads/master: 6bc822b5164e66ab9b93f96172df8902bfd37618
diff --git a/trunk/drivers/net/wireless/libertas/if_usb.c b/trunk/drivers/net/wireless/libertas/if_usb.c
index a086653803fe..6cd6c962937d 100644
--- a/trunk/drivers/net/wireless/libertas/if_usb.c
+++ b/trunk/drivers/net/wireless/libertas/if_usb.c
@@ -1003,7 +1003,7 @@ static int if_usb_resume(struct usb_interface *intf)
 
 	cardp->rx_urb_recall = 0;
 
-	if_usb_submit_rx_urb(cardp->priv);
+	if_usb_submit_rx_urb(cardp);
 
 	netif_device_attach(cardp->eth_dev);
 	netif_device_attach(priv->mesh_dev);
diff --git a/trunk/drivers/net/wireless/libertas/if_usb.h b/trunk/drivers/net/wireless/libertas/if_usb.h
index 224c957e292d..f028df1d018c 100644
--- a/trunk/drivers/net/wireless/libertas/if_usb.h
+++ b/trunk/drivers/net/wireless/libertas/if_usb.h
@@ -4,6 +4,8 @@
 #include <linux/wait.h>
 #include <linux/timer.h>
 
+struct lbs_private;
+
 /**
   * This file contains definition for USB interface.
   */
@@ -48,7 +50,7 @@ struct usb_card_rec {
 	struct net_device *eth_dev;
 	struct usb_device *udev;
 	struct urb *rx_urb, *tx_urb;
-	void *priv;
+	struct lbs_private *priv;
 	struct read_cb_info rinfo;
 
 	int bulk_in_size;