| From 2fc68eb122c7ea6cd5be1fe7d6650c0beb2f4f40 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> |
| Date: Thu, 12 Jun 2014 22:28:22 +0200 |
| Subject: b43: fix frequency reported on G-PHY with /new/ firmware |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> |
| |
| commit 2fc68eb122c7ea6cd5be1fe7d6650c0beb2f4f40 upstream. |
| |
| 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> |
| Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi> |
| Signed-off-by: John W. Linville <linville@tuxdriver.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/wireless/b43/xmit.c | 10 +++++++--- |
| 1 file changed, 7 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/net/wireless/b43/xmit.c |
| +++ b/drivers/net/wireless/b43/xmit.c |
| @@ -808,9 +808,13 @@ void b43_rx(struct b43_wldev *dev, struc |
| break; |
| case B43_PHYTYPE_G: |
| status.band = IEEE80211_BAND_2GHZ; |
| - /* chanid is the radio channel cookie value as used |
| - * to tune the radio. */ |
| - status.freq = chanid + 2400; |
| + /* Somewhere between 478.104 and 508.1084 firmware for G-PHY |
| + * has been modified to be compatible with N-PHY and others. |
| + */ |
| + if (dev->fw.rev >= 508) |
| + status.freq = ieee80211_channel_to_frequency(chanid, status.band); |
| + else |
| + status.freq = chanid + 2400; |
| break; |
| case B43_PHYTYPE_N: |
| case B43_PHYTYPE_LP: |
