diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-29 22:50:10 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-29 22:50:10 +0200 |
| commit | 7905e357ebe67a26d9dc8caa1a0b8346431b5f0d (patch) | |
| tree | 134442df2f062caa6cebda1b352948b8209efcec /drivers/net/wireless/b43 | |
| parent | netxen: fix interrupt for NX2031 (diff) | |
| parent | iwlwifi: fix build error for CONFIG_IWLAGN=n (diff) | |
| download | linux-7905e357ebe67a26d9dc8caa1a0b8346431b5f0d.tar.xz linux-7905e357ebe67a26d9dc8caa1a0b8346431b5f0d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/b43')
| -rw-r--r-- | drivers/net/wireless/b43/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 1521b1e78d21..14cf3bd7ea51 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -4348,11 +4348,10 @@ static int b43_wireless_core_init(struct b43_wldev *dev) b43_set_phytxctl_defaults(dev); /* Minimum Contention Window */ - if (phy->type == B43_PHYTYPE_B) { + if (phy->type == B43_PHYTYPE_B) b43_shm_write16(dev, B43_SHM_SCRATCH, B43_SHM_SC_MINCONT, 0x1F); - } else { + else b43_shm_write16(dev, B43_SHM_SCRATCH, B43_SHM_SC_MINCONT, 0xF); - } /* Maximum Contention Window */ b43_shm_write16(dev, B43_SHM_SCRATCH, B43_SHM_SC_MAXCONT, 0x3FF); |