diff options
| author | Rafał Miłecki | 2014-06-29 21:46:45 +0200 |
|---|---|---|
| committer | John W. Linville | 2014-07-01 20:26:26 +0200 |
| commit | b49c3caf5ef1476895f92ea5fac0b6bd48854628 (patch) | |
| tree | 83578da628fdcea12f79a31c0d06a3071dfc2f21 /drivers | |
| parent | drivers/net/wireless/ipw2x00/libipw_module.c: remove unnecessary null test be... (diff) | |
| download | kernel-qcow2-linux-b49c3caf5ef1476895f92ea5fac0b6bd48854628.tar.gz kernel-qcow2-linux-b49c3caf5ef1476895f92ea5fac0b6bd48854628.tar.xz kernel-qcow2-linux-b49c3caf5ef1476895f92ea5fac0b6bd48854628.zip | |
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 <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/b43/main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index aae3af2a7a9f..3740b76162f9 100644 --- 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: |