Merge tag 'wireless-drivers-next-for-davem-2018-07-23' of git://git.kernel.org/pub...

[uclinux-h8/linux.git] / drivers / net / wireless / ath / ath10k / mac.c

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 836e0a4..541bc1c 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -7737,7 +7737,7 @@ static void ath10k_sta_statistics(struct ieee80211_hw *hw,
                return;
 
        sinfo->rx_duration = arsta->rx_duration;
-       sinfo->filled |= 1ULL << NL80211_STA_INFO_RX_DURATION;
+       sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_DURATION);
 
        if (!arsta->txrate.legacy && !arsta->txrate.nss)
                return;
@@ -7750,7 +7750,7 @@ static void ath10k_sta_statistics(struct ieee80211_hw *hw,
                sinfo->txrate.bw = arsta->txrate.bw;
        }
        sinfo->txrate.flags = arsta->txrate.flags;
-       sinfo->filled |= 1ULL << NL80211_STA_INFO_TX_BITRATE;
+       sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);
 }
 
 static const struct ieee80211_ops ath10k_ops = {
@@ -7870,6 +7870,9 @@ static const struct ieee80211_channel ath10k_5ghz_channels[] = {
        CHAN5G(161, 5805, 0),
        CHAN5G(165, 5825, 0),
        CHAN5G(169, 5845, 0),
+       CHAN5G(173, 5865, 0),
+       /* If you add more, you may need to change ATH10K_MAX_5G_CHAN */
+       /* And you will definitely need to change ATH10K_NUM_CHANS in core.h */
 };
 
 struct ath10k *ath10k_mac_create(size_t priv_size)