mt76: Use the correct hweight8() function
authorBen Hutchings <ben@decadent.org.uk>
Tue, 12 Feb 2019 15:36:24 +0000 (15:36 +0000)
committerFelix Fietkau <nbd@nbd.name>
Mon, 18 Feb 2019 19:10:28 +0000 (20:10 +0100)
mt76_init_stream_cap() and mt76_get_txpower() call __sw_hweight8()
directly, but that's only defined if CONFIG_GENERIC_HWEIGHT is
enabled.  The function that works on all architectures is hweight8().

Fixes: 551e1ef4d291 ("mt76: add mt76_init_stream_cap routine")
Fixes: 9313faacbb4e ("mt76: move mt76x02_get_txpower to mt76 core")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mac80211.c

index c7abf4f54867a07626e75b0138c84e3d5611661e..82e9f78ef328701bab15268acad73776b4cf44e7 100644 (file)
@@ -124,7 +124,7 @@ static void mt76_init_stream_cap(struct mt76_dev *dev,
                                 bool vht)
 {
        struct ieee80211_sta_ht_cap *ht_cap = &sband->ht_cap;
-       int i, nstream = __sw_hweight8(dev->antenna_mask);
+       int i, nstream = hweight8(dev->antenna_mask);
        struct ieee80211_sta_vht_cap *vht_cap;
        u16 mcs_map = 0;
 
@@ -726,7 +726,7 @@ int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                     int *dbm)
 {
        struct mt76_dev *dev = hw->priv;
-       int n_chains = __sw_hweight8(dev->antenna_mask);
+       int n_chains = hweight8(dev->antenna_mask);
 
        *dbm = dev->txpower_cur / 2;