diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2024-02-15 09:54:45 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2024-02-15 09:56:42 +0100 |
| commit | cd882e2fb2e63c80367fc984a2155239710e2801 (patch) | |
| tree | 870cc3a731b541d35e181c85c8b63a1cfcfd279d /net/mac80211/tx.c | |
| parent | 182094411e29fa76b6651f31fd7b941780a45c56 (diff) | |
| parent | b7198383ef2debe748118996f627452281cf27d7 (diff) | |
Merge wireless into wireless-next
There's a conflict already and some upcoming changes
also depend on changes in wireless for being conflict-
free, so pull wireless in to make all that easier.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 373275d18f5a..f4be4af568be 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3930,6 +3930,7 @@ begin: goto begin; skb = __skb_dequeue(&tx.skbs); + info = IEEE80211_SKB_CB(skb); if (!skb_queue_empty(&tx.skbs)) { spin_lock_bh(&fq->lock); @@ -3975,7 +3976,7 @@ begin: } encap_out: - IEEE80211_SKB_CB(skb)->control.vif = vif; + info->control.vif = vif; if (tx.sta && wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL)) { |