---

yaml --- r: 108028 b: refs/heads/master c: 5423b2e h: refs/heads/master v: v3
git-mirror · Aug 7, 2008 · dd7cec9 · dd7cec9
1 parent 4119f19
commit dd7cec9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fc980392e5a06cff34ca7acaac5790bb59528d1
+refs/heads/master: 5423b2ed25993e13009ce39f55d742c3c6d03edb
diff --git a/trunk/drivers/net/wireless/p54/p54common.c b/trunk/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;