b43: treat LCNXN-PHY as extra N-PHY devices

LCNXN is simply a continuation of N, e.g. code handling LCNXN revs 0 and
1 is mostly the same as for N-PHY revs 7+.

Signed-off-by: Rafał Miłecki <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index aae3af2a7a9f1006af114defb2c809b3b5d5cd98..3740b76162f970de58c51979789ec921d1a25eba 100644 (file)
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4331,6 +4331,13 @@ static int b43_phy_versioning(struct b43_wldev *dev)
        analog_type = (tmp & B43_PHYVER_ANALOG) >> B43_PHYVER_ANALOG_SHIFT;
        phy_type = (tmp & B43_PHYVER_TYPE) >> B43_PHYVER_TYPE_SHIFT;
        phy_rev = (tmp & B43_PHYVER_VERSION);
+
+       /* LCNXN is continuation of N which run out of revisions */
+       if (phy_type == B43_PHYTYPE_LCNXN) {
+               phy_type = B43_PHYTYPE_N;
+               phy_rev += 16;
+       }
+
        switch (phy_type) {
 #ifdef CONFIG_B43_PHY_G
        case B43_PHYTYPE_G: