hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iwlwifi: mvm: don't disable power management due to P2P device 

Currently power management is supported only when only a single
virtual interface is present. The driver verifies number of created
interfaces and disables power management when multiple interfaces
present. However, this rule does not extend to a P2P device that is
handled differently in the firmware. If a P2P device is added power
management can remain enabled.

Signed-off-by: Alexander Bondar <alexander.bondar@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Alexander Bondar 2013-03-05 10:16:40 +02:00 committed by Johannes Berg
parent f4a3e2fefe
commit 5ee2b2154e
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/wireless/iwlwifi/mvm/mac80211.c
View File

@ -502,10 +502,14 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,
/* /*
* TODO: remove this temporary code. * TODO: remove this temporary code.
* Currently MVM FW supports power management only on single MAC. * Currently MVM FW supports power management only on single MAC.
* Iterate and disable PM on all active interfaces. * If new interface added, disable PM on existing interface.
* P2P device is a special case, since it is handled by FW similary to
* scan. If P2P deviced is added, PM remains enabled on existing
* interface.
* Note: the method below does not count the new interface being added * Note: the method below does not count the new interface being added
* at this moment. * at this moment.
*/ */
if (vif->type != NL80211_IFTYPE_P2P_DEVICE)
mvm->vif_count++; mvm->vif_count++;
if (mvm->vif_count > 1) { if (mvm->vif_count > 1) {
IWL_DEBUG_MAC80211(mvm, IWL_DEBUG_MAC80211(mvm,
@ -576,9 +580,10 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,
/* /*
* TODO: remove this temporary code. * TODO: remove this temporary code.
* Currently MVM FW supports power management only on single MAC. * Currently MVM FW supports power management only on single MAC.
* Check if only one additional interface remains after rereasing * Check if only one additional interface remains after releasing
* current one. Update power mode on the remaining interface. * current one. Update power mode on the remaining interface.
*/ */
if (vif->type != NL80211_IFTYPE_P2P_DEVICE)
mvm->vif_count--; mvm->vif_count--;
IWL_DEBUG_MAC80211(mvm, "Currently %d interfaces active\n", IWL_DEBUG_MAC80211(mvm, "Currently %d interfaces active\n",
mvm->vif_count); mvm->vif_count);
@ -666,7 +671,7 @@ static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw,
* Check if only one additional interface remains after removing * Check if only one additional interface remains after removing
* current one. Update power mode on the remaining interface. * current one. Update power mode on the remaining interface.
*/ */
if (mvm->vif_count) if (mvm->vif_count && vif->type != NL80211_IFTYPE_P2P_DEVICE)
mvm->vif_count--; mvm->vif_count--;
IWL_DEBUG_MAC80211(mvm, "Currently %d interfaces active\n", IWL_DEBUG_MAC80211(mvm, "Currently %d interfaces active\n",
mvm->vif_count); mvm->vif_count);

7
drivers/net/wireless/iwlwifi/mvm/mvm.h
View File

@ -322,6 +322,13 @@ struct iwl_mvm {
* can hold 16 keys at most. Reflect this fact. * can hold 16 keys at most. Reflect this fact.
*/ */
unsigned long fw_key_table[BITS_TO_LONGS(STA_KEY_MAX_NUM)]; unsigned long fw_key_table[BITS_TO_LONGS(STA_KEY_MAX_NUM)];
/*
* This counter of created interfaces is referenced only in conjunction
* with FW limitation related to power management. Currently PM is
* supported only on a single interface.
* IMPORTANT: this variable counts all interfaces except P2P device.
*/
u8 vif_count; u8 vif_count;
struct led_classdev led; struct led_classdev led;