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

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

[PATCH] mac80211: fix printk warning on 64-bit 



My AID message patch introduced a warning on 64-bit machines because ~
extends to unsigned long:

| net/mac80211/ieee80211_sta.c: In function ‘ieee80211_rx_mgmt_assoc_resp’:
| net/mac80211/ieee80211_sta.c:1187: warning: format ‘%d’ expects type ‘int’, but argument 7 has type ‘long unsigned int’

This fixes it by explicitly casting the result to u16 (which 'aid' is).

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

net/mac80211/ieee80211_sta.c

+1 −1
Original line number Diff line number Diff line
@@ -1184,7 +1184,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct net_device *dev, 
	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 & ~(BIT(15) | BIT(14)));

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



	if (status_code != WLAN_STATUS_SUCCESS) {

		printk(KERN_DEBUG "%s: AP denied association (code=%d)\n",