提交 2fc68eb1 编写于 作者: R Rafał Miłecki 提交者: John W. Linville

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 3afc2167
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: NAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: NRafał Miłecki <zajec5@gmail.com>
Cc: stable@vger.kernel.org
Tested-by: NAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 b663cd10
...@@ -811,9 +811,13 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) ...@@ -811,9 +811,13 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
break; break;
case B43_PHYTYPE_G: case B43_PHYTYPE_G:
status.band = IEEE80211_BAND_2GHZ; status.band = IEEE80211_BAND_2GHZ;
/* chanid is the radio channel cookie value as used /* Somewhere between 478.104 and 508.1084 firmware for G-PHY
* to tune the radio. */ * has been modified to be compatible with N-PHY and others.
status.freq = chanid + 2400; */
if (dev->fw.rev >= 508)
status.freq = ieee80211_channel_to_frequency(chanid, status.band);
else
status.freq = chanid + 2400;
break; break;
case B43_PHYTYPE_N: case B43_PHYTYPE_N:
case B43_PHYTYPE_LP: case B43_PHYTYPE_LP:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册