summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse2007-12-11 18:53:43 +0100
committerDavid S. Miller2008-01-29 00:06:43 +0100
commit6bc822b5164e66ab9b93f96172df8902bfd37618 (patch)
tree5def4d4a14c99c60867d48e2abb4247d90f68e3e
parentlibertas: convert GET_HW_SPEC to a direct command (diff)
downloadkernel-qcow2-linux-6bc822b5164e66ab9b93f96172df8902bfd37618.tar.gz
kernel-qcow2-linux-6bc822b5164e66ab9b93f96172df8902bfd37618.tar.xz
kernel-qcow2-linux-6bc822b5164e66ab9b93f96172df8902bfd37618.zip
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)
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/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 @@
#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;