diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-14 09:36:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-14 09:36:51 -0700 |
| commit | 2a2af5e6e6f55e8ec381f710b8765ffe2838e313 (patch) | |
| tree | 743a182912d7bb35ecc6b67e7323d3dd25869f3a /net/wireless/scan.c | |
| parent | 4add700968c7761acba88e70a0aa3f44e5ad359d (diff) | |
| parent | b65842025335711e2a0259feb4dbadb0c9ffb6d9 (diff) | |
| download | linux-2a2af5e6e6f55e8ec381f710b8765ffe2838e313.tar.gz linux-2a2af5e6e6f55e8ec381f710b8765ffe2838e313.tar.bz2 linux-2a2af5e6e6f55e8ec381f710b8765ffe2838e313.zip | |
Merge tag 'mac80211-for-davem-2019-06-14' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Various fixes, all over:
* a few memory leaks
* fixes for management frame protection security
and A2/A3 confusion (affecting TDLS as well)
* build fix for certificates
* etc.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/scan.c')
| -rw-r--r-- | net/wireless/scan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index c04f5451f89b..aa571d727903 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -1601,12 +1601,12 @@ static void cfg80211_parse_mbssid_data(struct wiphy *wiphy, continue; } - if (seen_indices & BIT(mbssid_index_ie[2])) + if (seen_indices & BIT_ULL(mbssid_index_ie[2])) /* We don't support legacy split of a profile */ net_dbg_ratelimited("Partial info for BSSID index %d\n", mbssid_index_ie[2]); - seen_indices |= BIT(mbssid_index_ie[2]); + seen_indices |= BIT_ULL(mbssid_index_ie[2]); non_tx_data->bssid_index = mbssid_index_ie[2]; non_tx_data->max_bssid_indicator = elem->data[0]; |