Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit aefbc0b5c64ca719760ccb2cf26f0a3e313a57d9

Authored by Mathy Vanhoef
Committed by Greg Kroah-Hartman
1 parent 0c217359ae

mac80211: properly set CCK flag in radiotap 

commit 3a5c5e81d8128a9e43abc52b75dd21d3da7a0cfc upstream.

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.

Fixes: a5e70697d0c4 ("mac80211: add radiotap flag and handling for 5/10 MHz")
Signed-off-by: Mathy Vanhoef <vanhoefm@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -235,7 +235,7 @@
235 235 else if (rate && rate->flags & IEEE80211_RATE_ERP_G)
236 236 channel_flags |= IEEE80211_CHAN_OFDM | IEEE80211_CHAN_2GHZ;
237 237 else if (rate)
238   - channel_flags |= IEEE80211_CHAN_OFDM | IEEE80211_CHAN_2GHZ;
  238 + channel_flags |= IEEE80211_CHAN_CCK | IEEE80211_CHAN_2GHZ;
239 239 else
240 240 channel_flags |= IEEE80211_CHAN_2GHZ;
241 241 put_unaligned_le16(channel_flags, pos);