]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] mac80211: fix printk warning on 64-bit
authorJohannes Berg <johannes@sipsolutions.net>
Mon, 22 Oct 2007 12:51:37 +0000 (14:51 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 26 Oct 2007 04:14:29 +0000 (00:14 -0400)
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: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/ieee80211_sta.c

index 77ef223a9431a233d409ce21225090814f05d047..fda0e06453e85bc5f8d00867170dd41d17e9e65c 100644 (file)
@@ -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",