Commit 3f0d2178 authored by Ming Yen Hsieh's avatar Ming Yen Hsieh Committed by Felix Fietkau
Browse files

wifi: mt76: mt7925: fix wrong parameter for related cmd of chan info 



Fix incorrect parameters for the related channel information command.

Fixes: 86c051f2 ("wifi: mt76: mt7925: enabling MLO when the firmware supports it")
Signed-off-by: default avatarMing Yen Hsieh <mingyen.hsieh@mediatek.com>
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Link: https://patch.msgid.link/20241211011926.5002-6-sean.wang@kernel.org


Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 4f741a23

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

+21 −2
Original line number Diff line number Diff line
@@ -1198,6 +1198,8 @@ int mt7925_mcu_set_mlo_roc(struct mt792x_bss_conf *mconf, u16 sel_links, 
		req.roc[i].bw_from_ap = CMD_CBW_20MHZ;

		req.roc[i].center_chan = center_ch;

		req.roc[i].center_chan_from_ap = center_ch;

		req.roc[i].center_chan2 = 0;

		req.roc[i].center_chan2_from_ap = 0;



		/* STR : 0xfe indicates BAND_ALL with enabling DBDC

		 * EMLSR : 0xff indicates (BAND_AUTO) without DBDC
@@ -2175,11 +2177,27 @@ void mt7925_mcu_bss_rlm_tlv(struct sk_buff *skb, struct mt76_phy *phy, 
	req = (struct bss_rlm_tlv *)tlv;

	req->control_channel = chandef->chan->hw_value;

	req->center_chan = ieee80211_frequency_to_channel(freq1);

	req->center_chan2 = ieee80211_frequency_to_channel(freq2);

	req->center_chan2 = 0;

	req->tx_streams = hweight8(phy->antenna_mask);

	req->ht_op_info = 4; /* set HT 40M allowed */

	req->rx_streams = hweight8(phy->antenna_mask);

	req->band = band;

	req->center_chan2 = 0;

	req->sco = 0;

	req->band = 1;



	switch (band) {

	case NL80211_BAND_2GHZ:

		req->band = 1;

		break;

	case NL80211_BAND_5GHZ:

		req->band = 2;

		break;

	case NL80211_BAND_6GHZ:

		req->band = 3;

		break;

	default:

		break;

	}



	switch (chandef->width) {

	case NL80211_CHAN_WIDTH_40:
@@ -2190,6 +2208,7 @@ void mt7925_mcu_bss_rlm_tlv(struct sk_buff *skb, struct mt76_phy *phy, 
		break;

	case NL80211_CHAN_WIDTH_80P80:

		req->bw = CMD_CBW_8080MHZ;

		req->center_chan2 = ieee80211_frequency_to_channel(freq2);

		break;

	case NL80211_CHAN_WIDTH_160:

		req->bw = CMD_CBW_160MHZ;