|
@@ -1285,7 +1285,6 @@ static int ath6kl_cfg80211_set_txpower(struct wiphy *wiphy,
|
|
|
{
|
|
|
struct ath6kl *ar = (struct ath6kl *)wiphy_priv(wiphy);
|
|
|
struct ath6kl_vif *vif;
|
|
|
- u8 ath6kl_dbm;
|
|
|
int dbm = MBM_TO_DBM(mbm);
|
|
|
|
|
|
ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: type 0x%x, dbm %d\n", __func__,
|
|
@@ -1302,7 +1301,7 @@ static int ath6kl_cfg80211_set_txpower(struct wiphy *wiphy,
|
|
|
case NL80211_TX_POWER_AUTOMATIC:
|
|
|
return 0;
|
|
|
case NL80211_TX_POWER_LIMITED:
|
|
|
- ar->tx_pwr = ath6kl_dbm = dbm;
|
|
|
+ ar->tx_pwr = dbm;
|
|
|
break;
|
|
|
default:
|
|
|
ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: type 0x%x not supported\n",
|
|
@@ -1310,7 +1309,7 @@ static int ath6kl_cfg80211_set_txpower(struct wiphy *wiphy,
|
|
|
return -EOPNOTSUPP;
|
|
|
}
|
|
|
|
|
|
- ath6kl_wmi_set_tx_pwr_cmd(ar->wmi, vif->fw_vif_idx, ath6kl_dbm);
|
|
|
+ ath6kl_wmi_set_tx_pwr_cmd(ar->wmi, vif->fw_vif_idx, dbm);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
@@ -3088,7 +3087,8 @@ struct net_device *ath6kl_interface_add(struct ath6kl *ar, char *name,
|
|
|
vif->wdev.netdev = ndev;
|
|
|
vif->wdev.iftype = type;
|
|
|
vif->fw_vif_idx = fw_vif_idx;
|
|
|
- vif->nw_type = vif->next_mode = nw_type;
|
|
|
+ vif->nw_type = nw_type;
|
|
|
+ vif->next_mode = nw_type;
|
|
|
vif->listen_intvl_t = ATH6KL_DEFAULT_LISTEN_INTVAL;
|
|
|
vif->bmiss_time_t = ATH6KL_DEFAULT_BMISS_TIME;
|
|
|
|