FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-14 21:48:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

iwlwifi: mvm: Remove bf_vif from iwl_power_vifs

Browse Source 
This member is actually not needed as beacon abort
is only allowed for a bss station.

Signed-off-by: Avri Altman <avri.altman@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This commit is contained in:
Avri Altman 2016-01-24 15:18:59 +02:00 committed by Emmanuel Grumbach
parent c257d5fb52
commit 8812182e5d
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/net/wireless/intel/iwlwifi/mvm/power.c
View File

@ -577,7 +577,6 @@ void iwl_mvm_power_uapsd_misbehaving_ap_notif(struct iwl_mvm *mvm,
struct iwl_power_vifs { struct iwl_power_vifs {
struct iwl_mvm *mvm; struct iwl_mvm *mvm;
struct ieee80211_vif *bf_vif;
struct ieee80211_vif *bss_vif; struct ieee80211_vif *bss_vif;
struct ieee80211_vif *p2p_vif; struct ieee80211_vif *p2p_vif;
struct ieee80211_vif *ap_vif; struct ieee80211_vif *ap_vif;
@ -650,11 +649,6 @@ static void iwl_mvm_power_get_vifs_iterator(void *_data, u8 *mac,
if (mvmvif->phy_ctxt) if (mvmvif->phy_ctxt)
if (mvmvif->phy_ctxt->id < MAX_PHYS) if (mvmvif->phy_ctxt->id < MAX_PHYS)
power_iterator->bss_active = true; power_iterator->bss_active = true;
if (mvmvif->bf_data.bf_enabled &&
!WARN_ON(power_iterator->bf_vif))
power_iterator->bf_vif = vif;
break; break;
default: default:
@ -959,21 +953,19 @@ static int iwl_mvm_power_set_ps(struct iwl_mvm *mvm)
} }
static int iwl_mvm_power_set_ba(struct iwl_mvm *mvm, static int iwl_mvm_power_set_ba(struct iwl_mvm *mvm,
struct iwl_power_vifs *vifs) struct ieee80211_vif *vif)
{ {
struct iwl_mvm_vif *mvmvif; struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
bool ba_enable; bool ba_enable;
if (!vifs->bf_vif) if (!mvmvif->bf_data.bf_enabled)
return 0; return 0;
mvmvif = iwl_mvm_vif_from_mac80211(vifs->bf_vif);
ba_enable = !(!mvmvif->pm_enabled || mvm->ps_disabled || ba_enable = !(!mvmvif->pm_enabled || mvm->ps_disabled ||
!vifs->bf_vif->bss_conf.ps || !vif->bss_conf.ps ||
iwl_mvm_vif_low_latency(mvmvif)); iwl_mvm_vif_low_latency(mvmvif));
return iwl_mvm_update_beacon_abort(mvm, vifs->bf_vif, ba_enable); return iwl_mvm_update_beacon_abort(mvm, vif, ba_enable);
} }
int iwl_mvm_power_update_ps(struct iwl_mvm *mvm) int iwl_mvm_power_update_ps(struct iwl_mvm *mvm)
@ -994,7 +986,10 @@ int iwl_mvm_power_update_ps(struct iwl_mvm *mvm)
if (ret) if (ret)
return ret; return ret;
return iwl_mvm_power_set_ba(mvm, &vifs); if (vifs.bss_vif)
return iwl_mvm_power_set_ba(mvm, vifs.bss_vif);
return 0;
} }
int iwl_mvm_power_update_mac(struct iwl_mvm *mvm) int iwl_mvm_power_update_mac(struct iwl_mvm *mvm)
@ -1029,7 +1024,10 @@ int iwl_mvm_power_update_mac(struct iwl_mvm *mvm)
return ret; return ret;
} }
return iwl_mvm_power_set_ba(mvm, &vifs); if (vifs.bss_vif)
return iwl_mvm_power_set_ba(mvm, vifs.bss_vif);
return 0;
} }
int iwl_mvm_update_d0i3_power_mode(struct iwl_mvm *mvm, int iwl_mvm_update_d0i3_power_mode(struct iwl_mvm *mvm,