Commit f2a00a82 authored by Felix Fietkau's avatar Felix Fietkau Committed by Kalle Valo
Browse files

mt76: mt7603: use the correct hweight8() function 



__sw_hweight8() is only defined if CONFIG_GENERIC_HWEIGHT is enabled.
The function that works on all architectures is hweight8().

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 40b94161

drivers/net/wireless/mediatek/mt76/mt7603/beacon.c

+1 −2
Original line number Diff line number Diff line
@@ -135,8 +135,7 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg) 


out:

	mt76_queue_tx_cleanup(dev, MT_TXQ_BEACON, false);

	if (dev->mt76.q_tx[MT_TXQ_BEACON].queued >

	    __sw_hweight8(dev->beacon_mask))

	if (dev->mt76.q_tx[MT_TXQ_BEACON].queued > hweight8(dev->beacon_mask))

		dev->beacon_check++;

}

drivers/net/wireless/mediatek/mt76/mt7603/init.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static void 
mt7603_phy_init(struct mt7603_dev *dev)

{

	int rx_chains = dev->mt76.antenna_mask;

	int tx_chains = __sw_hweight8(rx_chains) - 1;

	int tx_chains = hweight8(rx_chains) - 1;



	mt76_rmw(dev, MT_WF_RMAC_RMCR,

		 (MT_WF_RMAC_RMCR_SMPS_MODE |

drivers/net/wireless/mediatek/mt76/mt7603/mcu.c

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ int mt7603_mcu_set_channel(struct mt7603_dev *dev) 
{

	struct cfg80211_chan_def *chandef = &dev->mt76.chandef;

	struct ieee80211_hw *hw = mt76_hw(dev);

	int n_chains = __sw_hweight8(dev->mt76.antenna_mask);

	int n_chains = hweight8(dev->mt76.antenna_mask);

	struct {

		u8 control_chan;

		u8 center_chan;

CRA Git | Maintained and supported by SUSTech CRA and CCSE