mt76: mt7615: switch mt7615_mcu_set_rx_ba to v2 format (e07880b2) · Commits · 戴 / test

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

+34 −28

Original line number	Diff line number	Diff line
		@@ -1769,29 +1769,11 @@ int mt7615_mcu_set_rx_ba(struct mt7615_dev *dev,
		{
		struct mt7615_sta msta = (struct mt7615_sta )params->sta->drv_priv;
		struct mt7615_vif *mvif = msta->vif;
		struct {
		struct wtbl_req_hdr hdr;
		struct wtbl_ba ba;
		} wtbl_req = {
		.hdr = {
		.wlan_idx = msta->wcid.idx,
		.operation = WTBL_SET,
		.tlv_num = cpu_to_le16(1),
		},
		.ba = {
		.tag = cpu_to_le16(WTBL_BA),
		.len = cpu_to_le16(sizeof(struct wtbl_ba)),
		.tid = params->tid,
		.ba_type = MT_BA_TYPE_RECIPIENT,
		.rst_ba_tid = params->tid,
		.rst_ba_sel = RST_BA_MAC_TID_MATCH,
		.rst_ba_sb = 1,
		},
		};
		struct {
		struct sta_req_hdr hdr;
		struct sta_rec_ba ba;
		} sta_req = {
		u8 buf[MT7615_WTBL_UPDATE_MAX_SIZE];
		} __packed req = {
		.hdr = {
		.bss_idx = mvif->idx,
		.wlan_idx = msta->wcid.idx,
		@@ -1810,17 +1792,41 @@ int mt7615_mcu_set_rx_ba(struct mt7615_dev *dev,
		.winsize = cpu_to_le16(params->buf_size),
		},
		};
		int ret;
		struct sta_rec_wtbl *wtbl = NULL;
		struct wtbl_req_hdr *wtbl_hdr;
		struct wtbl_ba *wtbl_ba;
		u8 *buf = req.buf;

		memcpy(wtbl_req.ba.peer_addr, params->sta->addr, ETH_ALEN);
		if (dev->fw_ver > MT7615_FIRMWARE_V1) {
		req.hdr.tlv_num = cpu_to_le16(2);
		wtbl = (struct sta_rec_wtbl *)buf;
		wtbl->tag = cpu_to_le16(STA_REC_WTBL);
		buf += sizeof(*wtbl);
		}

		ret = __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_STA_REC_UPDATE,
		&sta_req, sizeof(sta_req), true);
		if (ret \|\| !add)
		return ret;
		wtbl_hdr = (struct wtbl_req_hdr *)buf;
		buf += sizeof(*wtbl_hdr);
		wtbl_hdr->wlan_idx = msta->wcid.idx;
		wtbl_hdr->operation = WTBL_SET;
		wtbl_hdr->tlv_num = cpu_to_le16(1);

		return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_WTBL_UPDATE,
		&wtbl_req, sizeof(wtbl_req), true);
		wtbl_ba = (struct wtbl_ba *)buf;
		buf += sizeof(*wtbl_ba);
		wtbl_ba->tag = cpu_to_le16(WTBL_BA);
		wtbl_ba->len = cpu_to_le16(sizeof(*wtbl_ba));
		wtbl_ba->tid = params->tid;
		wtbl_ba->ba_type = MT_BA_TYPE_RECIPIENT;
		wtbl_ba->rst_ba_tid = params->tid;
		wtbl_ba->rst_ba_sel = RST_BA_MAC_TID_MATCH;
		wtbl_ba->rst_ba_sb = 1;

		memcpy(wtbl_ba->peer_addr, params->sta->addr, ETH_ALEN);

		if (wtbl)
		wtbl->len = cpu_to_le16(buf - (u8 *)wtbl_hdr);

		return mt7615_mcu_send_sta_rec(dev, (u8 )&req, (u8 )wtbl_hdr,
		buf - (u8 *)wtbl_hdr, add);
		}

		int mt7615_mcu_get_temperature(struct mt7615_dev *dev, int index)

Admin message