2015-01-20 14:05:12

by Mathy Vanhoef

Subject: [PATCH] mac80211: properly set CCK flag in radiotap

Fix a regression introduced by commit a5e70697d0c4 ("mac80211: add radiotap flag
and handling for 5/10 MHz") where the IEEE80211_CHAN_CCK channel type flag was
incorrectly replaced by the IEEE80211_CHAN_OFDM flag. This commit fixes that by
using the CCK flag again.

Signed-off-by: Mathy Vanhoef <[email protected]>
---
net/mac80211/rx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index a37f9af..2d23d33 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -235,7 +235,7 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
else if (rate && rate->flags & IEEE80211_RATE_ERP_G)
channel_flags |= IEEE80211_CHAN_OFDM | IEEE80211_CHAN_2GHZ;
else if (rate)
- channel_flags |= IEEE80211_CHAN_OFDM | IEEE80211_CHAN_2GHZ;
+ channel_flags |= IEEE80211_CHAN_CCK | IEEE80211_CHAN_2GHZ;
else
channel_flags |= IEEE80211_CHAN_2GHZ;
put_unaligned_le16(channel_flags, pos);
--
1.7.10.4

2015-01-23 09:54:18

by Johannes Berg

Subject: Re: [PATCH] mac80211: properly set CCK flag in radiotap

On Tue, 2015-01-20 at 15:05 +0100, Mathy Vanhoef wrote:
> Fix a regression introduced by commit a5e70697d0c4 ("mac80211: add radiotap flag
> and handling for 5/10 MHz") where the IEEE80211_CHAN_CCK channel type flag was
> incorrectly replaced by the IEEE80211_CHAN_OFDM flag. This commit fixes that by
> using the CCK flag again.

Applied.

johannes