Commit aefbc0b5 authored Jan 20, 2015 by Mathy Vanhoef Committed by Greg Kroah-Hartman Feb 05, 2015

mac80211: properly set CCK flag in radiotap

commit 3a5c5e81d8128a9e43abc52b75dd21d3da7a0cfc upstream.

Fix a regression introduced by commit a5e70697 ("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: a5e70697 ("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>

parent 0c217359

net/mac80211/rx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);