diff options
| author | Mathy Vanhoef <Mathy.Vanhoef@kuleuven.be> | 2020-11-04 10:18:21 +0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2020-11-06 11:02:42 +0100 |
| commit | 527d675969a1dff17baa270d4447ac1c87058299 (patch) | |
| tree | 54bdfabe6d94f49f43bb72c618efb9c80e2d8156 /net/mac80211/tx.c | |
| parent | 66d06c84730c8b148d93909ffbddf074fd771a48 (diff) | |
| download | linux-527d675969a1dff17baa270d4447ac1c87058299.tar.bz2 | |
mac80211: don't overwrite QoS TID of injected frames
Currently ieee80211_set_qos_hdr sets the QoS TID of all frames based
on the value assigned to skb->priority. This means it will also
overwrite the QoS TID of injected frames. The commit 753ffad3d624
("mac80211: fix TID field in monitor mode transmit") prevented
injected frames from being modified because of this by setting
skb->priority to the TID of the injected frame, which assured the
QoS TID will not be changed to a different value. Unfortunately,
this workaround complicates the handling of injected frames because
we can't set skb->priority without affecting the TID value in the
QoS field of injected frames.
To avoid this, and to simplify the next patch, detect if a frame is
injected in ieee80211_set_qos_hdr and if so do not change its QoS
field.
Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@kuleuven.be>
Link: https://lore.kernel.org/r/20201104061823.197407-4-Mathy.Vanhoef@kuleuven.be
[fix typos in commit message]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index d4e1a2720807..8bf80b6757dc 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2271,10 +2271,7 @@ netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb, payload[7]); } - /* - * Initialize skb->priority for QoS frames. This is put in the TID field - * of the frame before passing it to the driver. - */ + /* Initialize skb->priority for QoS frames */ if (ieee80211_is_data_qos(hdr->frame_control)) { u8 *p = ieee80211_get_qos_ctl(hdr); skb->priority = *p & IEEE80211_QOS_CTL_TAG1D_MASK; |