Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99f65f25 authored by Ulrich Kunitz's avatar Ulrich Kunitz Committed by John W. Linville
Browse files

[PATCH] zd1211rw: Fixes radiotap header 



There has been a problem in the radiotap header. Monitor mode
works now with tcpdump 3.94 + libpcap 0.9.4. ethereal 0.99.0 +
libpcap 0.9.4 is broken, because it doesn't find the right offset
for the IEEE 802.11 header.

Signed-off-by: default avatarUlrich Kunitz <kune@deine-taler.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 49b1e3ea

drivers/net/wireless/zd1211rw/zd_mac.c

+4 −4
Original line number Diff line number Diff line
@@ -713,10 +713,10 @@ static int zd_mac_tx(struct zd_mac *mac, struct ieee80211_txb *txb, int pri) 
struct zd_rt_hdr {

	struct ieee80211_radiotap_header rt_hdr;

	u8  rt_flags;

	u8  rt_rate;

	u16 rt_channel;

	u16 rt_chbitmask;

	u16 rt_rate;

};

} __attribute__((packed));



static void fill_rt_header(void *buffer, struct zd_mac *mac,

	                   const struct ieee80211_rx_stats *stats,
@@ -735,14 +735,14 @@ static void fill_rt_header(void *buffer, struct zd_mac *mac, 
	if (status->decryption_type & (ZD_RX_WEP64|ZD_RX_WEP128|ZD_RX_WEP256))

		hdr->rt_flags |= IEEE80211_RADIOTAP_F_WEP;



	hdr->rt_rate = stats->rate / 5;



	/* FIXME: 802.11a */

	hdr->rt_channel = cpu_to_le16(ieee80211chan2mhz(

		                             _zd_chip_get_channel(&mac->chip)));

	hdr->rt_chbitmask = cpu_to_le16(IEEE80211_CHAN_2GHZ |

		((status->frame_status & ZD_RX_FRAME_MODULATION_MASK) ==

		ZD_RX_OFDM ? IEEE80211_CHAN_OFDM : IEEE80211_CHAN_CCK));



	hdr->rt_rate = stats->rate / 5;

}



/* Returns 1 if the data packet is for us and 0 otherwise. */