mt76: mt7915: rely on mt76_connac_mcu_sta_ba_tlv
authorLorenzo Bianconi <lorenzo@kernel.org>
Thu, 23 Dec 2021 12:07:33 +0000 (13:07 +0100)
committerFelix Fietkau <nbd@nbd.name>
Thu, 3 Feb 2022 12:57:57 +0000 (13:57 +0100)
Rely on mt76_connac_mcu_sta_ba_tlv routine in mt7915 and remove
duplicated code.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c

index 4fb7bc81d7c99316c3f36f6f61f059bec93f5e07..7b94d78393dc3c496359ac9e769ddf85d297de38 100644 (file)
@@ -742,25 +742,6 @@ out:
 }
 
 /** starec & wtbl **/
-static void
-mt7915_mcu_sta_ba_tlv(struct sk_buff *skb,
-                     struct ieee80211_ampdu_params *params,
-                     bool enable, bool tx)
-{
-       struct sta_rec_ba *ba;
-       struct tlv *tlv;
-
-       tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_BA, sizeof(*ba));
-
-       ba = (struct sta_rec_ba *)tlv;
-       ba->ba_type = tx ? MT_BA_TYPE_ORIGINATOR : MT_BA_TYPE_RECIPIENT;
-       ba->winsize = cpu_to_le16(params->buf_size);
-       ba->ssn = cpu_to_le16(params->ssn);
-       ba->ba_en = enable << params->tid;
-       ba->amsdu = params->amsdu;
-       ba->tid = params->tid;
-}
-
 static void
 mt7915_mcu_wtbl_ba_tlv(struct sk_buff *skb,
                       struct ieee80211_ampdu_params *params,
@@ -831,7 +812,7 @@ mt7915_mcu_sta_ba(struct mt7915_dev *dev,
        if (IS_ERR(skb))
                return PTR_ERR(skb);
 
-       mt7915_mcu_sta_ba_tlv(skb, params, enable, tx);
+       mt76_connac_mcu_sta_ba_tlv(skb, params, enable, tx);
 
        return mt76_mcu_skb_send_msg(&dev->mt76, skb,
                                     MCU_EXT_CMD(STA_REC_UPDATE), true);