mac80211: fix variable truncation on 32-bit

Stephen Rothwell reported these warnings from a 32-bit build:

  net/mac80211/mlme.c:1771: warning: left shift count >= width of type
  net/mac80211/mlme.c:1772: warning: left shift count >= width of type
  net/mac80211/mlme.c:1773: warning: left shift count >= width of type
  net/mac80211/mlme.c:1774: warning: left shift count >= width of type
  net/mac80211/mlme.c:1775: warning: left shift count >= width of type

This shows a bug in my code -- BIT(X) uses just "1 << X" which means
a 32-bit integer on 32-bit platforms, but the code here needs a u64
on all platforms. Fix this by using "1ULL << X" instead of BIT(X).

Thanks Stephen!

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 1b0b7aa387ee7092275cc9fe753c0ac5b64dd8bb..e819c02d13f08197c1a4f2835a2e57b770e5e133 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1743,12 +1743,12 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata,
  *     look out for other vendor IEs.
  */
 static const u64 care_about_ies =
-       BIT(WLAN_EID_COUNTRY) |
-       BIT(WLAN_EID_ERP_INFO) |
-       BIT(WLAN_EID_CHANNEL_SWITCH) |
-       BIT(WLAN_EID_PWR_CONSTRAINT) |
-       BIT(WLAN_EID_HT_CAPABILITY) |
-       BIT(WLAN_EID_HT_INFORMATION);
+       (1ULL << WLAN_EID_COUNTRY) |
+       (1ULL << WLAN_EID_ERP_INFO) |
+       (1ULL << WLAN_EID_CHANNEL_SWITCH) |
+       (1ULL << WLAN_EID_PWR_CONSTRAINT) |
+       (1ULL << WLAN_EID_HT_CAPABILITY) |
+       (1ULL << WLAN_EID_HT_INFORMATION);
 
 static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
                                     struct ieee80211_mgmt *mgmt,