iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iwmc3200wifi: Dont set the UMAC power limit when interface is down

Browse Source 
When we're down, we shouldnt try to set the UMAC power limit. We just return 0
instead, and cfg80211 toggles the soft rfkill state.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Samuel Ortiz 2009-11-24 11:33:28 +08:00 committed by John W. Linville
parent 902b6667d3
commit fe19176ea4
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/iwmc3200wifi/cfg80211.c
View File

@ -678,6 +678,9 @@ static int iwm_cfg80211_set_txpower(struct wiphy *wiphy,
case TX_POWER_AUTOMATIC: case TX_POWER_AUTOMATIC:
return 0; return 0;
case TX_POWER_FIXED: case TX_POWER_FIXED:
if (!test_bit(IWM_STATUS_READY, &iwm->status))
return 0;
ret = iwm_umac_set_config_fix(iwm, UMAC_PARAM_TBL_CFG_FIX, ret = iwm_umac_set_config_fix(iwm, UMAC_PARAM_TBL_CFG_FIX,
CFG_TX_PWR_LIMIT_USR, dbm * 2); CFG_TX_PWR_LIMIT_USR, dbm * 2);
if (ret < 0) if (ret < 0)
@ -685,6 +688,7 @@ static int iwm_cfg80211_set_txpower(struct wiphy *wiphy,
return iwm_tx_power_trigger(iwm); return iwm_tx_power_trigger(iwm);
default: default:
IWM_ERR(iwm, "Unsupported power type: %d\n", type);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }