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

Commit 1dd84aa2 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

[PATCH] mac80211: reorder association debug output 



There's no reason to warn about an invalid AID field when the
association was denied.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Acked-by: default avatarMichael Wu <flamingice@sourmilk.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9be4bfb9

net/mac80211/ieee80211_sta.c

+6 −5
Original line number Diff line number Diff line
@@ -1203,15 +1203,11 @@ static void ieee80211_rx_mgmt_assoc_resp(struct net_device *dev, 
	capab_info = le16_to_cpu(mgmt->u.assoc_resp.capab_info);

	status_code = le16_to_cpu(mgmt->u.assoc_resp.status_code);

	aid = le16_to_cpu(mgmt->u.assoc_resp.aid);

	if ((aid & (BIT(15) | BIT(14))) != (BIT(15) | BIT(14)))

		printk(KERN_DEBUG "%s: invalid aid value %d; bits 15:14 not "

		       "set\n", dev->name, aid);

	aid &= ~(BIT(15) | BIT(14));



	printk(KERN_DEBUG "%s: RX %sssocResp from %s (capab=0x%x "

	       "status=%d aid=%d)\n",

	       dev->name, reassoc ? "Rea" : "A", print_mac(mac, mgmt->sa),

	       capab_info, status_code, aid);

	       capab_info, status_code, aid & ~(BIT(15) | BIT(14)));



	if (status_code != WLAN_STATUS_SUCCESS) {

		printk(KERN_DEBUG "%s: AP denied association (code=%d)\n",
@@ -1223,6 +1219,11 @@ static void ieee80211_rx_mgmt_assoc_resp(struct net_device *dev, 
		return;

	}



	if ((aid & (BIT(15) | BIT(14))) != (BIT(15) | BIT(14)))

		printk(KERN_DEBUG "%s: invalid aid value %d; bits 15:14 not "

		       "set\n", dev->name, aid);

	aid &= ~(BIT(15) | BIT(14));



	pos = mgmt->u.assoc_resp.variable;

	if (ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems)

	    == ParseFailed) {