[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1225383127-16406-4-git-send-email-penberg@cs.helsinki.fi>
Date: Thu, 30 Oct 2008 18:12:04 +0200
From: Pekka Enberg <penberg@...helsinki.fi>
To: greg@...ah.com
Cc: linux-kernel@...r.kernel.org,
Pekka Enberg <penberg@...helsinki.fi>,
Pavel Machek <pavel@...e.cz>
Subject: [PATCH 4/7] w35und: move global wbsoft_enabled to struct wbsoft_priv
This is a preparational step for moving packet_came() to wb35rx.c().
Cc: Pavel Machek <pavel@...e.cz>
Signed-off-by: Pekka Enberg <penberg@...helsinki.fi>
---
drivers/staging/winbond/core.h | 2 ++
drivers/staging/winbond/wbusb.c | 11 ++++++-----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/winbond/core.h b/drivers/staging/winbond/core.h
index 64b73bb..c6dd223 100644
--- a/drivers/staging/winbond/core.h
+++ b/drivers/staging/winbond/core.h
@@ -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 */
diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c
index 0f70101..246f20b 100644
--- a/drivers/staging/winbond/wbusb.c
+++ b/drivers/staging/winbond/wbusb.c
@@ -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 @@ error:
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);
--
1.5.3.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists