Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ff71613 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: improve/fix mlme messages 



It's useful to know the MAC address when being
disassociated; fix a typo (missing colon) and
move some messages so we get them only when they
are actually taking effect.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8bb89485

net/mac80211/mlme.c

+9 −9
Original line number Diff line number Diff line
@@ -1388,8 +1388,8 @@ ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata, 


	reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);



	printk(KERN_DEBUG "%s: disassociated (Reason: %u)\n",

			sdata->dev->name, reason_code);

	printk(KERN_DEBUG "%s: disassociated from %pM (Reason: %u)\n",

			sdata->dev->name, mgmt->sa, reason_code);



	ieee80211_set_disassoc(sdata, false);

	return RX_MGMT_CFG80211_DISASSOC;
@@ -1675,7 +1675,7 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata, 


	/* direct probe may be part of the association flow */

	if (wk && wk->state == IEEE80211_MGD_STATE_PROBE) {

		printk(KERN_DEBUG "%s direct probe responded\n",

		printk(KERN_DEBUG "%s: direct probe responded\n",

		       sdata->dev->name);

		wk->tries = 0;

		wk->state = IEEE80211_MGD_STATE_AUTH;
@@ -2502,9 +2502,6 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata, 
	struct ieee80211_mgd_work *wk;

	const u8 *bssid = NULL;



	printk(KERN_DEBUG "%s: deauthenticating by local choice (reason=%d)\n",

	       sdata->dev->name, req->reason_code);



	mutex_lock(&ifmgd->mtx);



	if (ifmgd->associated && &ifmgd->associated->cbss == req->bss) {
@@ -2532,6 +2529,9 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata, 


	mutex_unlock(&ifmgd->mtx);



	printk(KERN_DEBUG "%s: deauthenticating from %pM by local choice (reason=%d)\n",

	       sdata->dev->name, bssid, req->reason_code);



	ieee80211_send_deauth_disassoc(sdata, bssid,

			IEEE80211_STYPE_DEAUTH, req->reason_code,

			cookie);
@@ -2545,9 +2545,6 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata, 
{

	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;



	printk(KERN_DEBUG "%s: disassociating by local choice (reason=%d)\n",

	       sdata->dev->name, req->reason_code);



	mutex_lock(&ifmgd->mtx);



	/*
@@ -2561,6 +2558,9 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata, 
		return -ENOLINK;

	}



	printk(KERN_DEBUG "%s: disassociating from %pM by local choice (reason=%d)\n",

	       sdata->dev->name, req->bss->bssid, req->reason_code);



	ieee80211_set_disassoc(sdata, false);



	mutex_unlock(&ifmgd->mtx);