diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mac80211.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac80211.c | 65 |
1 files changed, 43 insertions, 22 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index e08683b20531..f19baf0dea6b 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c | |||
@@ -257,7 +257,11 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) | |||
257 | if (ret) | 257 | if (ret) |
258 | return ret; | 258 | return ret; |
259 | 259 | ||
260 | return ieee80211_register_hw(mvm->hw); | 260 | ret = ieee80211_register_hw(mvm->hw); |
261 | if (ret) | ||
262 | iwl_mvm_leds_exit(mvm); | ||
263 | |||
264 | return ret; | ||
261 | } | 265 | } |
262 | 266 | ||
263 | static void iwl_mvm_mac_tx(struct ieee80211_hw *hw, | 267 | static void iwl_mvm_mac_tx(struct ieee80211_hw *hw, |
@@ -385,6 +389,7 @@ static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm) | |||
385 | ieee80211_wake_queues(mvm->hw); | 389 | ieee80211_wake_queues(mvm->hw); |
386 | 390 | ||
387 | mvm->vif_count = 0; | 391 | mvm->vif_count = 0; |
392 | mvm->rx_ba_sessions = 0; | ||
388 | } | 393 | } |
389 | 394 | ||
390 | static int iwl_mvm_mac_start(struct ieee80211_hw *hw) | 395 | static int iwl_mvm_mac_start(struct ieee80211_hw *hw) |
@@ -507,6 +512,27 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, | |||
507 | goto out_unlock; | 512 | goto out_unlock; |
508 | 513 | ||
509 | /* | 514 | /* |
515 | * TODO: remove this temporary code. | ||
516 | * Currently MVM FW supports power management only on single MAC. | ||
517 | * If new interface added, disable PM on existing interface. | ||
518 | * P2P device is a special case, since it is handled by FW similary to | ||
519 | * scan. If P2P deviced is added, PM remains enabled on existing | ||
520 | * interface. | ||
521 | * Note: the method below does not count the new interface being added | ||
522 | * at this moment. | ||
523 | */ | ||
524 | if (vif->type != NL80211_IFTYPE_P2P_DEVICE) | ||
525 | mvm->vif_count++; | ||
526 | if (mvm->vif_count > 1) { | ||
527 | IWL_DEBUG_MAC80211(mvm, | ||
528 | "Disable power on existing interfaces\n"); | ||
529 | ieee80211_iterate_active_interfaces_atomic( | ||
530 | mvm->hw, | ||
531 | IEEE80211_IFACE_ITER_NORMAL, | ||
532 | iwl_mvm_pm_disable_iterator, mvm); | ||
533 | } | ||
534 | |||
535 | /* | ||
510 | * The AP binding flow can be done only after the beacon | 536 | * The AP binding flow can be done only after the beacon |
511 | * template is configured (which happens only in the mac80211 | 537 | * template is configured (which happens only in the mac80211 |
512 | * start_ap() flow), and adding the broadcast station can happen | 538 | * start_ap() flow), and adding the broadcast station can happen |
@@ -529,27 +555,6 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, | |||
529 | goto out_unlock; | 555 | goto out_unlock; |
530 | } | 556 | } |
531 | 557 | ||
532 | /* | ||
533 | * TODO: remove this temporary code. | ||
534 | * Currently MVM FW supports power management only on single MAC. | ||
535 | * If new interface added, disable PM on existing interface. | ||
536 | * P2P device is a special case, since it is handled by FW similary to | ||
537 | * scan. If P2P deviced is added, PM remains enabled on existing | ||
538 | * interface. | ||
539 | * Note: the method below does not count the new interface being added | ||
540 | * at this moment. | ||
541 | */ | ||
542 | if (vif->type != NL80211_IFTYPE_P2P_DEVICE) | ||
543 | mvm->vif_count++; | ||
544 | if (mvm->vif_count > 1) { | ||
545 | IWL_DEBUG_MAC80211(mvm, | ||
546 | "Disable power on existing interfaces\n"); | ||
547 | ieee80211_iterate_active_interfaces_atomic( | ||
548 | mvm->hw, | ||
549 | IEEE80211_IFACE_ITER_NORMAL, | ||
550 | iwl_mvm_pm_disable_iterator, mvm); | ||
551 | } | ||
552 | |||
553 | ret = iwl_mvm_mac_ctxt_add(mvm, vif); | 558 | ret = iwl_mvm_mac_ctxt_add(mvm, vif); |
554 | if (ret) | 559 | if (ret) |
555 | goto out_release; | 560 | goto out_release; |
@@ -1006,6 +1011,21 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw, | |||
1006 | mutex_lock(&mvm->mutex); | 1011 | mutex_lock(&mvm->mutex); |
1007 | if (old_state == IEEE80211_STA_NOTEXIST && | 1012 | if (old_state == IEEE80211_STA_NOTEXIST && |
1008 | new_state == IEEE80211_STA_NONE) { | 1013 | new_state == IEEE80211_STA_NONE) { |
1014 | /* | ||
1015 | * Firmware bug - it'll crash if the beacon interval is less | ||
1016 | * than 16. We can't avoid connecting at all, so refuse the | ||
1017 | * station state change, this will cause mac80211 to abandon | ||
1018 | * attempts to connect to this AP, and eventually wpa_s will | ||
1019 | * blacklist the AP... | ||
1020 | */ | ||
1021 | if (vif->type == NL80211_IFTYPE_STATION && | ||
1022 | vif->bss_conf.beacon_int < 16) { | ||
1023 | IWL_ERR(mvm, | ||
1024 | "AP %pM beacon interval is %d, refusing due to firmware bug!\n", | ||
1025 | sta->addr, vif->bss_conf.beacon_int); | ||
1026 | ret = -EINVAL; | ||
1027 | goto out_unlock; | ||
1028 | } | ||
1009 | ret = iwl_mvm_add_sta(mvm, vif, sta); | 1029 | ret = iwl_mvm_add_sta(mvm, vif, sta); |
1010 | } else if (old_state == IEEE80211_STA_NONE && | 1030 | } else if (old_state == IEEE80211_STA_NONE && |
1011 | new_state == IEEE80211_STA_AUTH) { | 1031 | new_state == IEEE80211_STA_AUTH) { |
@@ -1038,6 +1058,7 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw, | |||
1038 | } else { | 1058 | } else { |
1039 | ret = -EIO; | 1059 | ret = -EIO; |
1040 | } | 1060 | } |
1061 | out_unlock: | ||
1041 | mutex_unlock(&mvm->mutex); | 1062 | mutex_unlock(&mvm->mutex); |
1042 | 1063 | ||
1043 | return ret; | 1064 | return ret; |