]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: mt76: mt7996: Remove unnecessary link_id checks in mt7996_tx
authorLorenzo Bianconi <lorenzo@kernel.org>
Wed, 24 Sep 2025 13:51:39 +0000 (15:51 +0200)
committerFelix Fietkau <nbd@nbd.name>
Mon, 24 Nov 2025 13:37:53 +0000 (14:37 +0100)
Remove unnecessary link_id checks in mt7996_tx routine since if the link
identifier provided by mac80211 is unspecified the value will be
overwritten at the beginning on the function.

Fixes: f940c9b7aef6 ("wifi: mt76: mt7996: Set proper link destination address in mt7996_tx()")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20250924-mt76_tx_unnecessary-check-v1-1-e595930a5662@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt7996/main.c

index b53ca702591c62873dbdcf0835dda6289aeac3bd..2b52d057287a1f5d579584d4c8e03bd586ad99e2 100644 (file)
@@ -1339,12 +1339,10 @@ static void mt7996_tx(struct ieee80211_hw *hw,
        }
 
        if (mvif) {
-               struct mt76_vif_link *mlink = &mvif->deflink.mt76;
+               struct mt76_vif_link *mlink;
 
-               if (link_id < IEEE80211_LINK_UNSPECIFIED)
-                       mlink = rcu_dereference(mvif->mt76.link[link_id]);
-
-               if (mlink->wcid)
+               mlink = rcu_dereference(mvif->mt76.link[link_id]);
+               if (mlink && mlink->wcid)
                        wcid = mlink->wcid;
 
                if (mvif->mt76.roc_phy &&
@@ -1352,7 +1350,7 @@ static void mt7996_tx(struct ieee80211_hw *hw,
                        mphy = mvif->mt76.roc_phy;
                        if (mphy->roc_link)
                                wcid = mphy->roc_link->wcid;
-               } else {
+               } else if (mlink) {
                        mphy = mt76_vif_link_phy(mlink);
                }
        }
@@ -1362,7 +1360,7 @@ static void mt7996_tx(struct ieee80211_hw *hw,
                goto unlock;
        }
 
-       if (msta && link_id < IEEE80211_LINK_UNSPECIFIED) {
+       if (msta) {
                struct mt7996_sta_link *msta_link;
 
                msta_link = rcu_dereference(msta->link[link_id]);