mac80211: fix TX legacy rate reporting when tx_status_ext is used
PATCH 1/4 mac80211: fix TX legacy rate reporting when tx_status_ext is used
The RX Radiotap header length was not calculated properly when reporting legacy rates using tx_status_ext.
fixes commit 3d07ffcaf320 ("mac80211: add struct ieee80211_tx_status support to ieee80211_add_tx_radiotap_header")
--- net/mac80211/status.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/mac80211/status.c +9 -3
@@ -260,9 +260,15 @@ static int ieee80211_tx_radiotap_len(struct ieee80211_tx_info *info,int len =sizeof (struct ieee80211_radiotap_header );/* IEEE80211_RADIOTAP_RATE rate */ -if (info->status.rates[0 ].idx >=0 && - !(info->status.rates[0 ].flags & (IEEE80211_TX_RC_MCS | -IEEE80211_TX_RC_VHT_MCS ))) +if (status && status->rate && !(status->rate->flags & + (RATE_INFO_FLAGS_MCS | +RATE_INFO_FLAGS_60G | +RATE_INFO_FLAGS_VHT_MCS | +RATE_INFO_FLAGS_HE_MCS ))) + len +=2 ; +else if (info->status.rates[0 ].idx >=0 && + !(info->status.rates[0 ].flags & + (IEEE80211_TX_RC_MCS |IEEE80211_TX_RC_VHT_MCS ))) len +=2 ;/* IEEE80211_RADIOTAP_TX_FLAGS */
Signature · 1 line
2.20.1
PATCH 2/4 mac80211: fix bad guard when reporting legacy rates
When reporting legacy rates inside the TX Radiotap header we need to split the check u between "uses tx_statua_ext" and "is legacy rate". Not doing so would make the code drop into the !tx_status_ext path.
fixes commit 3d07ffcaf320 ("mac80211: add struct ieee80211_tx_status support to ieee80211_add_tx_radiotap_header")
--- net/mac80211/status.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
net/mac80211/status.c +8 -7
@@ -327,13 +327,14 @@ ieee80211_add_tx_radiotap_header(struct ieee80211_local *local,/* IEEE80211_RADIOTAP_RATE */ -if (status && status->rate && !(status->rate->flags & - (RATE_INFO_FLAGS_MCS | -RATE_INFO_FLAGS_60G | -RATE_INFO_FLAGS_VHT_MCS | -RATE_INFO_FLAGS_HE_MCS ))) - legacy_rate = status->rate->legacy; -else if (info->status.rates[0 ].idx >=0 && +if (status && status->rate) { +if (!(status->rate->flags & + (RATE_INFO_FLAGS_MCS | +RATE_INFO_FLAGS_60G | +RATE_INFO_FLAGS_VHT_MCS | +RATE_INFO_FLAGS_HE_MCS ))) + legacy_rate = status->rate->legacy; + }else if (info->status.rates[0 ].idx >=0 && !(info->status.rates[0 ].flags & (IEEE80211_TX_RC_MCS |IEEE80211_TX_RC_VHT_MCS ))) legacy_rate =
Signature · 1 line
2.20.1
PATCH 3/4 mac80211: 80Mhz was not reported properly when using tx_status_ext
In reply to John CrispinWhen reporting 80MHz, we need to set 4 and not 2 inside the corresponding field inside the Tx Radiotap header.
fixes commit 3d07ffcaf320 ("mac80211: add struct ieee80211_tx_status support to ieee80211_add_tx_radiotap_header")
--- net/mac80211/status.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/status.c +1 -1
@@ -404,7 +404,7 @@ ieee80211_add_tx_radiotap_header(struct ieee80211_local *local, *pos =11 ;break ;case RATE_INFO_BW_80 : - *pos =2 ; + *pos =4 ;break ;case RATE_INFO_BW_40 : *pos =1 ;
Signature · 1 line
2.20.1
PATCH 4/4 mac80211: add missing length field increment when generating Radiotap header
In reply to John CrispinThe code generating the Tx Radiotap header when using tx_status_ext was missing a field increment after setting the VHT bandwidth.
fixes commit 3d07ffcaf320 ("mac80211: add struct ieee80211_tx_status support to ieee80211_add_tx_radiotap_header")
--- net/mac80211/status.c | 1 + 1 file changed, 1 insertion(+)
net/mac80211/status.c +1 -0
@@ -413,6 +413,7 @@ ieee80211_add_tx_radiotap_header(struct ieee80211_local *local, *pos =0 ;break ; } + pos++;/* u8 mcs_nss[4] */ *pos = (status->rate->mcs <<4 ) | status->rate->nss;
Signature · 1 line
2.20.1