diff options
| author | Mathy Vanhoef <vanhoefm@gmail.com> | 2015-01-20 15:05:08 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-01-23 10:53:58 +0100 |
| commit | 3a5c5e81d8128a9e43abc52b75dd21d3da7a0cfc (patch) | |
| tree | 44e571ca4e203e9a4bf1b57e37eb38ef13d19920 /net | |
| parent | fb142f4bbb7d718b3d9cc8f27c909b4809545f5c (diff) | |
| download | op-kernel-dev-3a5c5e81d8128a9e43abc52b75dd21d3da7a0cfc.zip op-kernel-dev-3a5c5e81d8128a9e43abc52b75dd21d3da7a0cfc.tar.gz | |
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.
Cc: stable@vger.kernel.org
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 683b10f..d69ca51 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -272,7 +272,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); |
