diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/at76c50x-usb.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/mwl8k.c | 7 |
2 files changed, 2 insertions, 10 deletions
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c index a6e19545ac6a..8e1a55dec351 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) | |||
1950 | { | 1950 | { |
1951 | struct at76_priv *priv = hw->priv; | 1951 | struct at76_priv *priv = hw->priv; |
1952 | 1952 | ||
1953 | at76_dbg(DBG_MAC80211, "%s(): channel %d radio %d", | 1953 | at76_dbg(DBG_MAC80211, "%s(): channel %d", |
1954 | __func__, hw->conf.channel->hw_value, | 1954 | __func__, hw->conf.channel->hw_value); |
1955 | hw->conf.radio_enabled); | ||
1956 | at76_dbg_dump(DBG_MAC80211, priv->bssid, ETH_ALEN, "bssid:"); | 1955 | at76_dbg_dump(DBG_MAC80211, priv->bssid, ETH_ALEN, "bssid:"); |
1957 | 1956 | ||
1958 | mutex_lock(&priv->mtx); | 1957 | mutex_lock(&priv->mtx); |
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index f84387083e73..c32e93c8c410 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) | |||
3031 | struct mwl8k_priv *priv = hw->priv; | 3031 | struct mwl8k_priv *priv = hw->priv; |
3032 | int rc = 0; | 3032 | int rc = 0; |
3033 | 3033 | ||
3034 | if (!conf->radio_enabled) { | ||
3035 | mwl8k_cmd_802_11_radio_control(hw, MWL8K_RADIO_DISABLE); | ||
3036 | priv->current_channel = NULL; | ||
3037 | rc = 0; | ||
3038 | goto mwl8k_config_exit; | ||
3039 | } | ||
3040 | |||
3041 | if (mwl8k_cmd_802_11_radio_control(hw, MWL8K_RADIO_ENABLE)) { | 3034 | if (mwl8k_cmd_802_11_radio_control(hw, MWL8K_RADIO_ENABLE)) { |
3042 | rc = -EINVAL; | 3035 | rc = -EINVAL; |
3043 | goto mwl8k_config_exit; | 3036 | goto mwl8k_config_exit; |