diff options
| author | Omer Efrat <omer.efrat@tandemg.com> | 2018-06-17 13:06:25 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-06-29 09:53:09 +0200 |
| commit | a4217750586975dee7d6dd8829a1be24a7678b3d (patch) | |
| tree | 3708ac9a536391930f4f27975bff60ccb8919444 /net/mac80211/ethtool.c | |
| parent | 397c657a0644e7607c6aebea84d2b0f08ab59dfc (diff) | |
| download | linux-stable-a4217750586975dee7d6dd8829a1be24a7678b3d.tar.gz linux-stable-a4217750586975dee7d6dd8829a1be24a7678b3d.tar.bz2 linux-stable-a4217750586975dee7d6dd8829a1be24a7678b3d.zip | |
mac80211: use BIT_ULL for NL80211_STA_INFO_* attribute types
The BIT macro uses unsigned long which some architectures handle as 32 bit
and therefore might cause macro's shift to overflow when used on a value
equals or larger than 32 (NL80211_STA_INFO_RX_DURATION and afterwards).
Since 'filled' member in station_info changed to u64, BIT_ULL macro
should be used with all NL80211_STA_INFO_* attribute types instead of BIT
to prevent future possible bugs when one will use BIT macro for higher
attributes by mistake.
This commit cleans up all usages of BIT macro with the above field
in mac80211 by changing it to BIT_ULL instead.
Signed-off-by: Omer Efrat <omer.efrat@tandemg.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ethtool.c')
| -rw-r--r-- | net/mac80211/ethtool.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/ethtool.c b/net/mac80211/ethtool.c index 690c142a7a44..5ac743816b59 100644 --- a/net/mac80211/ethtool.c +++ b/net/mac80211/ethtool.c @@ -116,16 +116,16 @@ static void ieee80211_get_stats(struct net_device *dev, data[i++] = sta->sta_state; - if (sinfo.filled & BIT(NL80211_STA_INFO_TX_BITRATE)) + if (sinfo.filled & BIT_ULL(NL80211_STA_INFO_TX_BITRATE)) data[i] = 100000ULL * cfg80211_calculate_bitrate(&sinfo.txrate); i++; - if (sinfo.filled & BIT(NL80211_STA_INFO_RX_BITRATE)) + if (sinfo.filled & BIT_ULL(NL80211_STA_INFO_RX_BITRATE)) data[i] = 100000ULL * cfg80211_calculate_bitrate(&sinfo.rxrate); i++; - if (sinfo.filled & BIT(NL80211_STA_INFO_SIGNAL_AVG)) + if (sinfo.filled & BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG)) data[i] = (u8)sinfo.signal_avg; i++; } else { |