On 10/22/2010 03:24 PM, RafaÅ MiÅecki wrote:
> Signed-off-by: RafaÅ MiÅecki <zajec5@xxxxxxxxx>
> ---
> This makes my N-PHY radio at least running (no scanning results so far). The
> same register is used by wl on this device.
> ---
> drivers/net/wireless/b43/rfkill.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c
> index 78016ae..d2734c9 100644
> --- a/drivers/net/wireless/b43/rfkill.c
> +++ b/drivers/net/wireless/b43/rfkill.c
> @@ -28,7 +28,7 @@
> /* Returns TRUE, if the radio is enabled in hardware. */
> bool b43_is_hw_radio_enabled(struct b43_wldev *dev)
> {
> - if (dev->phy.rev >= 3 || dev->phy.type == B43_PHYTYPE_LP) {
> + if (dev->dev->id.revision >= 3) {
> if (!(b43_read32(dev, B43_MMIO_RADIO_HWENABLED_HI)
> & B43_MMIO_RADIO_HWENABLED_HI_MASK))
> return
As that register is present only when the core revision >= 3, this change should
not cause a regression. Perhaps this was an error in the RE from the start and
testing the phy.rev has always been wrong.
John: Just in case my analysis is wrong, keep this change out of 2.6.37. I'll
give it some testing with G PHYs before 2.6.38 merge time.
Larry
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
