aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-12-11 12:53:43 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:06:43 -0500
commit6bc822b5164e66ab9b93f96172df8902bfd37618 (patch)
tree5def4d4a14c99c60867d48e2abb4247d90f68e3e
parent6e66f03ff78b23d845920739373b1561c546b13f (diff)
libertas: switch USB cardp->priv to 'struct lbs_private *' and resulting fix
Amazing what interesting things the compiler will tell you if you let it know what types you expect to be passing around. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/libertas/if_usb.c2
-rw-r--r--drivers/net/wireless/libertas/if_usb.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index a086653803fe..6cd6c962937d 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -1003,7 +1003,7 @@ static int if_usb_resume(struct usb_interface *intf)
1003 1003
1004 cardp->rx_urb_recall = 0; 1004 cardp->rx_urb_recall = 0;
1005 1005
1006 if_usb_submit_rx_urb(cardp->priv); 1006 if_usb_submit_rx_urb(cardp);
1007 1007
1008 netif_device_attach(cardp->eth_dev); 1008 netif_device_attach(cardp->eth_dev);
1009 netif_device_attach(priv->mesh_dev); 1009 netif_device_attach(priv->mesh_dev);
diff --git a/drivers/net/wireless/libertas/if_usb.h b/drivers/net/wireless/libertas/if_usb.h
index 224c957e292d..f028df1d018c 100644
--- a/drivers/net/wireless/libertas/if_usb.h
+++ b/drivers/net/wireless/libertas/if_usb.h
@@ -4,6 +4,8 @@
4#include <linux/wait.h> 4#include <linux/wait.h>
5#include <linux/timer.h> 5#include <linux/timer.h>
6 6
7struct lbs_private;
8
7/** 9/**
8 * This file contains definition for USB interface. 10 * This file contains definition for USB interface.
9 */ 11 */
@@ -48,7 +50,7 @@ struct usb_card_rec {
48 struct net_device *eth_dev; 50 struct net_device *eth_dev;
49 struct usb_device *udev; 51 struct usb_device *udev;
50 struct urb *rx_urb, *tx_urb; 52 struct urb *rx_urb, *tx_urb;
51 void *priv; 53 struct lbs_private *priv;
52 struct read_cb_info rinfo; 54 struct read_cb_info rinfo;
53 55
54 int bulk_in_size; 56 int bulk_in_size;