diff options
author | Michael Buesch <mb@bu3sch.de> | 2007-12-09 16:34:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:05:58 -0500 |
commit | 8ed7fc48eb31e583bb31c2bcfdd3a9c557bad5d0 (patch) | |
tree | 43ece4c73d9e563c9a06b8fd7cde8cc8f72bbabb /drivers/net/wireless/b43/main.c | |
parent | bb54244be7d12c2a5985226061d598edb49c9078 (diff) |
b43: Fix ofdmtab write regression
commit f04b3787bbce4567e28069a9ec97dcd804626ac7 introduced
a regression for the ofdmtable writing.
It incorrectly removed the writing of the high 16bits for
a 32bit table write and initialized the direction identifier
too late.
This patch does also some cleanups to make the code much more
readable and adds a few comments, so non rocket scientists are
also able to understand what this address caching is all about.
Signed-off-by: Michael Buesch <mb@bu3sch.de>
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.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 064cbe11888..d7ea671394a 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -2264,12 +2264,6 @@ static int b43_chip_init(struct b43_wldev *dev) | |||
2264 | b43_write16(dev, B43_MMIO_POWERUP_DELAY, | 2264 | b43_write16(dev, B43_MMIO_POWERUP_DELAY, |
2265 | dev->dev->bus->chipco.fast_pwrup_delay); | 2265 | dev->dev->bus->chipco.fast_pwrup_delay); |
2266 | 2266 | ||
2267 | /* OFDM address caching. */ | ||
2268 | phy->ofdm_valid = 0; | ||
2269 | |||
2270 | /* PHY TX errors counter. */ | ||
2271 | atomic_set(&phy->txerr_cnt, B43_PHY_TX_BADNESS_LIMIT); | ||
2272 | |||
2273 | err = 0; | 2267 | err = 0; |
2274 | b43dbg(dev->wl, "Chip initialized\n"); | 2268 | b43dbg(dev->wl, "Chip initialized\n"); |
2275 | out: | 2269 | out: |
@@ -3195,6 +3189,12 @@ static void setup_struct_phy_for_init(struct b43_wldev *dev, | |||
3195 | phy->channel = 0xFF; | 3189 | phy->channel = 0xFF; |
3196 | 3190 | ||
3197 | phy->hardware_power_control = !!modparam_hwpctl; | 3191 | phy->hardware_power_control = !!modparam_hwpctl; |
3192 | |||
3193 | /* PHY TX errors counter. */ | ||
3194 | atomic_set(&phy->txerr_cnt, B43_PHY_TX_BADNESS_LIMIT); | ||
3195 | |||
3196 | /* OFDM-table address caching. */ | ||
3197 | phy->ofdmtab_addr_direction = B43_OFDMTAB_DIRECTION_UNKNOWN; | ||
3198 | } | 3198 | } |
3199 | 3199 | ||
3200 | static void setup_struct_wldev_for_init(struct b43_wldev *dev) | 3200 | static void setup_struct_wldev_for_init(struct b43_wldev *dev) |