summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@web.de>2008-08-07 10:22:28 +0200
committerJohn W. Linville <linville@tuxdriver.com>2008-08-07 09:49:04 -0400
commit5423b2ed25993e13009ce39f55d742c3c6d03edb (patch)
tree8dc807d7ffe38266cbd3830acb8c0c22702010e3 /drivers
parent0fc980392e5a06cff34ca7acaac5790bb59528d1 (diff)
downloadlinux-5423b2ed25993e13009ce39f55d742c3c6d03edb.tar.bz2
p54: swap short slot time dcf values
these "magic" values must to be the other way round... Signed-off-by: Christian Lamparter <chunkeey@web.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/p54/p54common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c
index 2d2d33612aef..83cd85e1f847 100644
--- a/drivers/net/wireless/p54/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@ -817,8 +817,8 @@ static void p54_set_vdcf(struct ieee80211_hw *dev)
if (dev->conf.flags & IEEE80211_CONF_SHORT_SLOT_TIME) {
vdcf->slottime = 9;
- vdcf->magic1 = 0x00;
- vdcf->magic2 = 0x10;
+ vdcf->magic1 = 0x10;
+ vdcf->magic2 = 0x00;
} else {
vdcf->slottime = 20;
vdcf->magic1 = 0x0a;