aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/b43/main.c
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2010-12-09 20:56:01 +0100
committerJohn W. Linville <linville@tuxdriver.com>2010-12-13 15:23:29 -0500
commit42ab135fe78025910bed8ff56e00a375f2b04db1 (patch)
tree48062468b386b02beab18aca1caf2621be968845 /drivers/net/wireless/b43/main.c
parentd242b90adf4e1918ac86433dfbb32a1136515bdd (diff)
b43: rename TMS defines, drop useless condition from core reset
As discussed we do not know band width at core reset time and it is not a good idea to reset whole just to change band. So just set unconditionally 20 MHz band width as default during core reset. As for defines PHY clock changed to band width in specs and it makes much more sens to call defines by band width which is self-explainable. Updated specs do not mention 0 value, but comparing to old ones you can notice lineral relation between PHY clock speed and band width. So it makes sense for 0x0 value to be 10 MHz band width. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
-rw-r--r--drivers/net/wireless/b43/main.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 9ae3f619e98..1aec160e3d2 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -1150,12 +1150,8 @@ void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags)
flags |= B43_TMSLOW_PHYCLKEN;
flags |= B43_TMSLOW_PHYRESET;
- if (dev->phy.type == B43_PHYTYPE_N) {
- if (b43_channel_type_is_40mhz(dev->phy.channel_type))
- flags |= B43_TMSLOW_PHYCLKSPEED_160MHZ;
- else
- flags |= B43_TMSLOW_PHYCLKSPEED_80MHZ;
- }
+ if (dev->phy.type == B43_PHYTYPE_N)
+ flags |= B43_TMSLOW_PHY_BANDWIDTH_20MHZ; /* Make 20 MHz def */
ssb_device_enable(dev->dev, flags);
msleep(2); /* Wait for the PLL to turn on. */