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

Commit c0624881 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

b43: report correct rate to mac80211 for 5 GHz packets 



So far we were assuming only A-PHY supports 5 GHz.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5d26b508

drivers/net/wireless/b43/xmit.c

+4 −3
Original line number Diff line number Diff line
@@ -80,9 +80,10 @@ static int b43_plcp_get_bitrate_idx_cck(struct b43_plcp_hdr6 *plcp) 
}



/* Extract the bitrate index out of an OFDM PLCP header. */

static int b43_plcp_get_bitrate_idx_ofdm(struct b43_plcp_hdr6 *plcp, bool aphy)

static int b43_plcp_get_bitrate_idx_ofdm(struct b43_plcp_hdr6 *plcp, bool ghz5)

{

	int base = aphy ? 0 : 4;

	/* For 2 GHz band first OFDM rate is at index 4, see main.c */

	int base = ghz5 ? 0 : 4;



	switch (plcp->raw[0] & 0xF) {

	case 0xB:
@@ -767,7 +768,7 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) 


	if (phystat0 & B43_RX_PHYST0_OFDM)

		rate_idx = b43_plcp_get_bitrate_idx_ofdm(plcp,

						phytype == B43_PHYTYPE_A);

					!!(chanstat & B43_RX_CHAN_5GHZ));

	else

		rate_idx = b43_plcp_get_bitrate_idx_cck(plcp);

	if (unlikely(rate_idx == -1)) {