diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-24 13:19:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-24 13:19:53 -0400 |
| commit | d2abae71ebcc409828b24ce9da402548ecdf1311 (patch) | |
| tree | 5edfafc2828d3bcebb3698520ccba374cd4328c0 /net/wireless/scan.c | |
| parent | 66567fcbaecac455caa1b13643155d686b51ce63 (diff) | |
| parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
Merge tag 'v5.2-rc6' into sched/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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, | |||
| 1601 | continue; | 1601 | continue; |
| 1602 | } | 1602 | } |
| 1603 | 1603 | ||
| 1604 | if (seen_indices & BIT(mbssid_index_ie[2])) | 1604 | if (seen_indices & BIT_ULL(mbssid_index_ie[2])) |
| 1605 | /* We don't support legacy split of a profile */ | 1605 | /* We don't support legacy split of a profile */ |
| 1606 | net_dbg_ratelimited("Partial info for BSSID index %d\n", | 1606 | net_dbg_ratelimited("Partial info for BSSID index %d\n", |
| 1607 | mbssid_index_ie[2]); | 1607 | mbssid_index_ie[2]); |
| 1608 | 1608 | ||
| 1609 | seen_indices |= BIT(mbssid_index_ie[2]); | 1609 | seen_indices |= BIT_ULL(mbssid_index_ie[2]); |
| 1610 | 1610 | ||
| 1611 | non_tx_data->bssid_index = mbssid_index_ie[2]; | 1611 | non_tx_data->bssid_index = mbssid_index_ie[2]; |
| 1612 | non_tx_data->max_bssid_indicator = elem->data[0]; | 1612 | non_tx_data->max_bssid_indicator = elem->data[0]; |