diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-10-30 16:14:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:51:49 -0800 |
| commit | 7fff1316b9ecc415fb1d43f438c0668884a24881 (patch) | |
| tree | 0d0c99dccd1a6d2fec46269b80f959c0a827b984 /drivers/staging/winbond/wbusb.c | |
| parent | 1e8a2b60339a050f4fd383e332a5dd66b75f4f02 (diff) | |
Staging: w35und: remove global struct ieee80211_hw
Remove the my_dev global variable from wbusb.c by passing a pointer to struct
ieee80211_hw around so that packet_came() gets it.
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/winbond/wbusb.c')
| -rw-r--r-- | drivers/staging/winbond/wbusb.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c index a6bc78e4609..40bb77ca657 100644 --- a/drivers/staging/winbond/wbusb.c +++ b/drivers/staging/winbond/wbusb.c @@ -45,7 +45,6 @@ static struct ieee80211_supported_band wbsoft_band_2GHz = { }; int wbsoft_enabled; -struct ieee80211_hw *my_dev; static int wbsoft_add_interface(struct ieee80211_hw *dev, struct ieee80211_if_init_conf *conf) @@ -225,7 +224,6 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id goto error; priv = dev->priv; - my_dev = dev; pWbUsb = &priv->sHwData.WbUsb; pWbUsb->udev = udev; @@ -238,7 +236,7 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id pWbUsb->IsUsb20 = 1; } - if (!WbWLanInitialize(priv)) { + if (!WbWLanInitialize(dev)) { err = -EINVAL; goto error_free_hw; } @@ -274,7 +272,7 @@ error: return err; } -void packet_came(char *pRxBufferAddress, int PacketSize) +void packet_came(struct ieee80211_hw *hw, char *pRxBufferAddress, int PacketSize) { struct sk_buff *skb; struct ieee80211_rx_status rx_status = {0}; @@ -299,7 +297,7 @@ void packet_came(char *pRxBufferAddress, int PacketSize) rx_status.phymode = MODE_IEEE80211B; */ - ieee80211_rx_irqsafe(my_dev, skb, &rx_status); + ieee80211_rx_irqsafe(hw, skb, &rx_status); } static void wb35_disconnect(struct usb_interface *intf) |