]> git.baikalelectronics.ru Git - kernel.git/commit
rtlwifi: rtl8192de: Fix phy-based version calculation
authorForest Bond <forest.bond@rapidrollout.com>
Fri, 13 Jul 2012 16:26:06 +0000 (12:26 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 17 Jul 2012 19:11:32 +0000 (15:11 -0400)
commit5ab6b9ba9d77b49a790ef7d6b4a6e614692ac13a
treed570601b5dcfa8530b778ec57447825f3ff21efc
parent295d1d97f69275b2d71e7d8324950488862a5cf7
rtlwifi: rtl8192de: Fix phy-based version calculation

Commit ff9b40243ed02c747b6fb13c594989c2ac4db90e incorporated some
changes from the vendor driver that made it newly important that the
calculated hardware version correctly include the CHIP_92D bit, as all
of the IS_92D_* macros were changed to depend on it.  However, this bit
was being unset for dual-mac, dual-phy devices.  The vendor driver
behavior was modified to not do this, but unfortunately this change was
not picked up along with the others.  This caused scanning in the 2.4GHz
band to be broken, and possibly other bugs as well.

This patch brings the version calculation logic in parity with the
vendor driver in this regard, and in doing so fixes the regression.
However, the version calculation code in general continues to be largely
incoherent and messy, and needs to be cleaned up.

Signed-off-by: Forest Bond <forest.bond@rapidrollout.com>
Cc: Stable <stable@vger.kernel.org> [v3.2+]
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rtlwifi/rtl8192de/phy.c