diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/cfg80211.c')
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/cfg80211.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index f3a6cfc0ddc..7845d33deed 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c | |||
@@ -860,20 +860,6 @@ void ath6kl_cfg80211_disconnect_event(struct ath6kl_vif *vif, u8 reason, | |||
860 | } | 860 | } |
861 | } | 861 | } |
862 | 862 | ||
863 | /* | ||
864 | * Send a disconnect command to target when a disconnect event is | ||
865 | * received with reason code other than 3 (DISCONNECT_CMD - disconnect | ||
866 | * request from host) to make the firmware stop trying to connect even | ||
867 | * after giving disconnect event. There will be one more disconnect | ||
868 | * event for this disconnect command with reason code DISCONNECT_CMD | ||
869 | * which will be notified to cfg80211. | ||
870 | */ | ||
871 | |||
872 | if (reason != DISCONNECT_CMD) { | ||
873 | ath6kl_wmi_disconnect_cmd(ar->wmi, vif->fw_vif_idx); | ||
874 | return; | ||
875 | } | ||
876 | |||
877 | clear_bit(CONNECT_PEND, &vif->flags); | 863 | clear_bit(CONNECT_PEND, &vif->flags); |
878 | 864 | ||
879 | if (vif->sme_state == SME_CONNECTING) { | 865 | if (vif->sme_state == SME_CONNECTING) { |
@@ -883,11 +869,22 @@ void ath6kl_cfg80211_disconnect_event(struct ath6kl_vif *vif, u8 reason, | |||
883 | WLAN_STATUS_UNSPECIFIED_FAILURE, | 869 | WLAN_STATUS_UNSPECIFIED_FAILURE, |
884 | GFP_KERNEL); | 870 | GFP_KERNEL); |
885 | } else if (vif->sme_state == SME_CONNECTED) { | 871 | } else if (vif->sme_state == SME_CONNECTED) { |
886 | cfg80211_disconnected(vif->ndev, reason, | 872 | cfg80211_disconnected(vif->ndev, proto_reason, |
887 | NULL, 0, GFP_KERNEL); | 873 | NULL, 0, GFP_KERNEL); |
888 | } | 874 | } |
889 | 875 | ||
890 | vif->sme_state = SME_DISCONNECTED; | 876 | vif->sme_state = SME_DISCONNECTED; |
877 | |||
878 | /* | ||
879 | * Send a disconnect command to target when a disconnect event is | ||
880 | * received with reason code other than 3 (DISCONNECT_CMD - disconnect | ||
881 | * request from host) to make the firmware stop trying to connect even | ||
882 | * after giving disconnect event. There will be one more disconnect | ||
883 | * event for this disconnect command with reason code DISCONNECT_CMD | ||
884 | * which won't be notified to cfg80211. | ||
885 | */ | ||
886 | if (reason != DISCONNECT_CMD) | ||
887 | ath6kl_wmi_disconnect_cmd(ar->wmi, vif->fw_vif_idx); | ||
891 | } | 888 | } |
892 | 889 | ||
893 | static int ath6kl_set_probed_ssids(struct ath6kl *ar, | 890 | static int ath6kl_set_probed_ssids(struct ath6kl *ar, |