wifi: mac80211: clarify vif handling in TX dequeue
authorJohannes Berg <johannes.berg@intel.com>
Wed, 31 Jan 2024 15:49:11 +0000 (16:49 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 8 Feb 2024 14:00:44 +0000 (15:00 +0100)
The vif pointer at least looks like it can actually be NULL
in some cases such as the monitor-mode vif, causing static
checkers to complain with the immediate derefence. In these
cases the sta pointer will also be NULL, but clarify it in
the code anyway.

Link: https://msgid.link/20240131164910.60066625a239.Idfb6a5a9876f9f631eae760055e1c4018259a971@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/tx.c

index f57f7963ca3772ca3c559ef05c7ed63526b6b2dc..098b32947c2b1a187f3d6204353c17776ad8edbf 100644 (file)
@@ -3953,7 +3953,8 @@ begin:
                        ieee80211_free_txskb(&local->hw, skb);
                        goto begin;
                } else {
-                       vif = NULL;
+                       info->control.vif = NULL;
+                       return skb;
                }
                break;
        case NL80211_IFTYPE_AP_VLAN: