Skip to content

Commit

Permalink
Staging: w35und: move global wbsoft_enabled to struct wbsoft_priv
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pekka Enberg authored and Greg Kroah-Hartman committed Jan 6, 2009
1 parent 82f8c2c commit c930e0c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
2 changes: 2 additions & 0 deletions drivers/staging/winbond/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 6 additions & 5 deletions drivers/staging/winbond/wbusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit c930e0c

Please sign in to comment.