From cd371fcc98d4eb365e74483810a55f6fd92a9774 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 30 Aug 2023 13:47:40 +0200 Subject: [PATCH] mt76: mt7996: sync with upstream Signed-off-by: Felix Fietkau --- mt7996/mac.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mt7996/mac.c b/mt7996/mac.c index 7df1c3b7..ac8759fe 100644 --- a/mt7996/mac.c +++ b/mt7996/mac.c @@ -832,11 +832,10 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi, { struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_vif *vif = info->control.vif; - struct mt76_vif *mvif; - struct mt76_phy *mphy = &dev->mphy; u8 band_idx = (info->hw_queue & MT_TX_HW_QUEUE_PHY) >> 2; u8 p_fmt, q_idx, omac_idx = 0, wmm_idx = 0; bool is_8023 = info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP; + struct mt76_vif *mvif; u16 tx_count = 15; u32 val; bool beacon = !!(changed & (BSS_CHANGED_BEACON | @@ -851,8 +850,6 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi, band_idx = mvif->band_idx; } - mphy = mt76_dev_phy(&dev->mt76, band_idx); - if (inband_disc) { p_fmt = MT_TX_TYPE_FW; q_idx = MT_LMAC_ALTX0;