openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Staging: w35und: move global wbsoft_enabled to struct wbsoft_priv 

This is a preparational step for moving packet_came() to wb35rx.c().

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>
This commit is contained in:
Pekka Enberg 2008-10-30 18:12:04 +02:00 committed by Greg Kroah-Hartman
parent 82f8c2cd46
commit c930e0c008
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/winbond/core.h
View File

@ -39,6 +39,8 @@ struct wbsoft_priv {
struct iw_statistics iw_stats;
u8 LinkName[WB_MAX_LINK_NAME_LEN];
bool enabled;
};
#endif /* __WINBOND_CORE_H */

11
drivers/staging/winbond/wbusb.c
View File

@ -46,8 +46,6 @@ static struct ieee80211_supported_band wbsoft_band_2GHz = {
.n_bitrates = ARRAY_SIZE(wbsoft_rates),
};
int wbsoft_enabled;
static int wbsoft_add_interface(struct ieee80211_hw *dev,
struct ieee80211_if_init_conf *conf)
{
@ -129,8 +127,10 @@ static int wbsoft_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
static int wbsoft_start(struct ieee80211_hw *dev)
{
wbsoft_enabled = 1;
printk("wbsoft_start called\n");
struct wbsoft_priv *priv = dev->priv;
priv->enabled = true;
return 0;
}
@ -393,10 +393,11 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id
void packet_came(struct ieee80211_hw *hw, char *pRxBufferAddress, int PacketSize)
{
struct wbsoft_priv *priv = hw->priv;
struct sk_buff *skb;
struct ieee80211_rx_status rx_status = {0};
if (!wbsoft_enabled)
if (!priv->enabled)
return;
skb = dev_alloc_skb(PacketSize);