diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-08-09 15:06:28 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-08-09 15:06:28 -0400 |
commit | 4f0544489215fc78cccb96f8e3d0f078ae965297 (patch) | |
tree | 69e71db0cf005a68ab1b70f33ae0462fd94152fc /drivers/net/wireless/iwlwifi/mvm/mac80211.c | |
parent | 2952f6ef5195ea76279f7370f0a6571867e54438 (diff) | |
parent | 5a6e0cf70743f30c17ccb5f228db9a124b0e7477 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mac80211.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac80211.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index fc61b274780c..785c782b166f 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c | |||
@@ -514,6 +514,27 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, | |||
514 | goto out_unlock; | 514 | goto out_unlock; |
515 | 515 | ||
516 | /* | 516 | /* |
517 | * TODO: remove this temporary code. | ||
518 | * Currently MVM FW supports power management only on single MAC. | ||
519 | * If new interface added, disable PM on existing interface. | ||
520 | * P2P device is a special case, since it is handled by FW similary to | ||
521 | * scan. If P2P deviced is added, PM remains enabled on existing | ||
522 | * interface. | ||
523 | * Note: the method below does not count the new interface being added | ||
524 | * at this moment. | ||
525 | */ | ||
526 | if (vif->type != NL80211_IFTYPE_P2P_DEVICE) | ||
527 | mvm->vif_count++; | ||
528 | if (mvm->vif_count > 1) { | ||
529 | IWL_DEBUG_MAC80211(mvm, | ||
530 | "Disable power on existing interfaces\n"); | ||
531 | ieee80211_iterate_active_interfaces_atomic( | ||
532 | mvm->hw, | ||
533 | IEEE80211_IFACE_ITER_NORMAL, | ||
534 | iwl_mvm_pm_disable_iterator, mvm); | ||
535 | } | ||
536 | |||
537 | /* | ||
517 | * The AP binding flow can be done only after the beacon | 538 | * The AP binding flow can be done only after the beacon |
518 | * template is configured (which happens only in the mac80211 | 539 | * template is configured (which happens only in the mac80211 |
519 | * start_ap() flow), and adding the broadcast station can happen | 540 | * start_ap() flow), and adding the broadcast station can happen |
@@ -537,27 +558,6 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, | |||
537 | goto out_unlock; | 558 | goto out_unlock; |
538 | } | 559 | } |
539 | 560 | ||
540 | /* | ||
541 | * TODO: remove this temporary code. | ||
542 | * Currently MVM FW supports power management only on single MAC. | ||
543 | * If new interface added, disable PM on existing interface. | ||
544 | * P2P device is a special case, since it is handled by FW similary to | ||
545 | * scan. If P2P deviced is added, PM remains enabled on existing | ||
546 | * interface. | ||
547 | * Note: the method below does not count the new interface being added | ||
548 | * at this moment. | ||
549 | */ | ||
550 | if (vif->type != NL80211_IFTYPE_P2P_DEVICE) | ||
551 | mvm->vif_count++; | ||
552 | if (mvm->vif_count > 1) { | ||
553 | IWL_DEBUG_MAC80211(mvm, | ||
554 | "Disable power on existing interfaces\n"); | ||
555 | ieee80211_iterate_active_interfaces_atomic( | ||
556 | mvm->hw, | ||
557 | IEEE80211_IFACE_ITER_NORMAL, | ||
558 | iwl_mvm_pm_disable_iterator, mvm); | ||
559 | } | ||
560 | |||
561 | ret = iwl_mvm_mac_ctxt_add(mvm, vif); | 561 | ret = iwl_mvm_mac_ctxt_add(mvm, vif); |
562 | if (ret) | 562 | if (ret) |
563 | goto out_release; | 563 | goto out_release; |