summaryrefslogtreecommitdiff
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-08-17 14:18:07 (GMT)
committerJohn W. Linville <linville@tuxdriver.com>2009-08-20 15:35:58 (GMT)
commitf424afa17899408cbd267a4c4534ca6fc9d8f71c (patch)
treeef68af16e693231b6842767ecd2ad04ba341cd93 /drivers/net/wireless
parent3ac64beecd27400d12cc7afb4108eef26c499f6a (diff)
downloadlinux-f424afa17899408cbd267a4c4534ca6fc9d8f71c.tar.xz
mac80211: remove deprecated API
All but two drivers have now stopped using the two deprecated members radio_enabled and beacon_int, so it's about time to remove them for good. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Acked-by: Kalle Valo <kalle.valo@iki.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/at76c50x-usb.c5
-rw-r--r--drivers/net/wireless/mwl8k.c7
2 files changed, 2 insertions, 10 deletions
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index a6e1954..8e1a55d 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -1950,9 +1950,8 @@ static int at76_config(struct ieee80211_hw *hw, u32 changed)
{
struct at76_priv *priv = hw->priv;
- at76_dbg(DBG_MAC80211, "%s(): channel %d radio %d",
- __func__, hw->conf.channel->hw_value,
- hw->conf.radio_enabled);
+ at76_dbg(DBG_MAC80211, "%s(): channel %d",
+ __func__, hw->conf.channel->hw_value);
at76_dbg_dump(DBG_MAC80211, priv->bssid, ETH_ALEN, "bssid:");
mutex_lock(&priv->mtx);
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index f843870..c32e93c 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -3031,13 +3031,6 @@ static int mwl8k_config_wt(struct work_struct *wt)
struct mwl8k_priv *priv = hw->priv;
int rc = 0;
- if (!conf->radio_enabled) {
- mwl8k_cmd_802_11_radio_control(hw, MWL8K_RADIO_DISABLE);
- priv->current_channel = NULL;
- rc = 0;
- goto mwl8k_config_exit;
- }
-
if (mwl8k_cmd_802_11_radio_control(hw, MWL8K_RADIO_ENABLE)) {
rc = -EINVAL;
goto mwl8k_config_exit;