mac80211: radiotap: assume modulation from rates (9deb1ae5) · Commits · 戴 / test

use the rates ERP flag to derive CCK or OFDM modulation for the radiotap header. (it might be more correct to get this information from the hardware itself, but it seems safe to assume this in most practical cases.) Signed-off-by:

Bruno Randolf <br1@einfach.org> Signed-off-by:

John W. Linville <linville@tuxdriver.com>

net/mac80211/rx.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -157,8 +157,11 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
		if (status->band == IEEE80211_BAND_5GHZ)
		(__le16 )pos = cpu_to_le16(IEEE80211_CHAN_OFDM \|
		IEEE80211_CHAN_5GHZ);
		else if (rate->flags & IEEE80211_RATE_ERP_G)
		(__le16 )pos = cpu_to_le16(IEEE80211_CHAN_OFDM \|
		IEEE80211_CHAN_2GHZ);
		else
		(__le16 )pos = cpu_to_le16(IEEE80211_CHAN_DYN \|
		(__le16 )pos = cpu_to_le16(IEEE80211_CHAN_CCK \|
		IEEE80211_CHAN_2GHZ);
		pos += 2;

Admin message