| From 3a5c5e81d8128a9e43abc52b75dd21d3da7a0cfc Mon Sep 17 00:00:00 2001 |
| From: Mathy Vanhoef <vanhoefm@gmail.com> |
| Date: Tue, 20 Jan 2015 15:05:08 +0100 |
| Subject: mac80211: properly set CCK flag in radiotap |
| |
| From: Mathy Vanhoef <vanhoefm@gmail.com> |
| |
| 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> |
| |
| --- |
| net/mac80211/rx.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/mac80211/rx.c |
| +++ b/net/mac80211/rx.c |
| @@ -235,7 +235,7 @@ ieee80211_add_rx_radiotap_header(struct |
| 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); |
