summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2016-01-25 08:46:36 -0500
committerJohannes Berg <johannes.berg@intel.com>2016-02-24 03:04:28 -0500
commit89f774e6c41efdcede9d4b37867af5aabcc835d5 (patch)
tree5a094834ae5fd98aef8d2455768c19b4f64f6af8 /net/mac80211/mlme.c
parentd321cd014e51baab475efbdec468255b9e0ec822 (diff)
mac80211: always print a message when disconnecting
Make sure there's at least a debug message whenever the connection to the AP is terminated. Also change one message from wiphy_debug() to the common mlme_dbg(). Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index e6d198b981ab..857089de475f 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3544,6 +3544,9 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
3544 elems.ht_cap_elem, elems.ht_operation, 3544 elems.ht_cap_elem, elems.ht_operation,
3545 elems.vht_operation, bssid, &changed)) { 3545 elems.vht_operation, bssid, &changed)) {
3546 mutex_unlock(&local->sta_mtx); 3546 mutex_unlock(&local->sta_mtx);
3547 sdata_info(sdata,
3548 "failed to follow AP %pM bandwidth change, disconnect\n",
3549 bssid);
3547 ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, 3550 ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,
3548 WLAN_REASON_DEAUTH_LEAVING, 3551 WLAN_REASON_DEAUTH_LEAVING,
3549 true, deauth_buf); 3552 true, deauth_buf);
@@ -3919,11 +3922,9 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata)
3919 * We actually lost the connection ... or did we? 3922 * We actually lost the connection ... or did we?
3920 * Let's make sure! 3923 * Let's make sure!
3921 */ 3924 */
3922 wiphy_debug(local->hw.wiphy, 3925 mlme_dbg(sdata,
3923 "%s: No probe response from AP %pM" 3926 "No probe response from AP %pM after %dms, disconnecting.\n",
3924 " after %dms, disconnecting.\n", 3927 bssid, probe_wait_ms);
3925 sdata->name,
3926 bssid, probe_wait_ms);
3927 3928
3928 ieee80211_sta_connection_lost(sdata, bssid, 3929 ieee80211_sta_connection_lost(sdata, bssid,
3929 WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY, false); 3930 WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY, false);
@@ -4511,6 +4512,9 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
4511 if (ifmgd->associated) { 4512 if (ifmgd->associated) {
4512 u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN]; 4513 u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN];
4513 4514
4515 sdata_info(sdata,
4516 "disconnect from AP %pM for new auth to %pM\n",
4517 ifmgd->associated->bssid, req->bss->bssid);
4514 ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, 4518 ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,
4515 WLAN_REASON_UNSPECIFIED, 4519 WLAN_REASON_UNSPECIFIED,
4516 false, frame_buf); 4520 false, frame_buf);
@@ -4579,6 +4583,9 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
4579 if (ifmgd->associated) { 4583 if (ifmgd->associated) {
4580 u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN]; 4584 u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN];
4581 4585
4586 sdata_info(sdata,
4587 "disconnect from AP %pM for new assoc to %pM\n",
4588 ifmgd->associated->bssid, req->bss->bssid);
4582 ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, 4589 ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,
4583 WLAN_REASON_UNSPECIFIED, 4590 WLAN_REASON_UNSPECIFIED,
4584 false, frame_buf); 4591 false, frame_buf);