Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

b43: fix frequency reported on G-PHY with /new/ firmware

Support for firmware rev 508+ was added years ago, but we never noticed
it reports channel in a different way for G-PHY devices. Instead of
offset from 2400 MHz it simply passes channel id (AKA hw_value).

So far it was (most probably) affecting monitor mode users only, but
the following recent commit made it noticeable for quite everybody:

commit 3afc2167f60a327a2c1e1e2600ef209a3c2b75b7
Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Tue Mar 4 16:50:13 2014 +0200

cfg80211/mac80211: ignore signal if the frame was heard on wrong channel

Reported-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Cc: stable@vger.kernel.org
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

authored by

Rafał Miłecki and committed by
John W. Linville
2fc68eb1 b663cd10

+7 -3
+7 -3
drivers/net/wireless/b43/xmit.c
··· 811 811 break; 812 812 case B43_PHYTYPE_G: 813 813 status.band = IEEE80211_BAND_2GHZ; 814 - /* chanid is the radio channel cookie value as used 815 - * to tune the radio. */ 816 - status.freq = chanid + 2400; 814 + /* Somewhere between 478.104 and 508.1084 firmware for G-PHY 815 + * has been modified to be compatible with N-PHY and others. 816 + */ 817 + if (dev->fw.rev >= 508) 818 + status.freq = ieee80211_channel_to_frequency(chanid, status.band); 819 + else 820 + status.freq = chanid + 2400; 817 821 break; 818 822 case B43_PHYTYPE_N: 819 823 case B43_PHYTYPE_LP: