summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Leffler <sam@FreeBSD.org>2003-09-14 22:32:18 +0000
committerSam Leffler <sam@FreeBSD.org>2003-09-14 22:32:18 +0000
commitfba3db9f57b7076c6a8fa3a80eb2cf316724e508 (patch)
tree38121365070490abb6b6236f831698afa06cd3f1
parentee3f02dee33abf4d22c3bb78e71c26b345f957af (diff)
Notes
-rw-r--r--sys/net80211/ieee80211.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c
index 2c389137c32af..71caeab929e5e 100644
--- a/sys/net80211/ieee80211.c
+++ b/sys/net80211/ieee80211.c
@@ -699,15 +699,15 @@ ieee80211_setmode(struct ieee80211com *ic, enum ieee80211_phymode mode)
* XXX what if we have stations already associated???
* XXX probably not right for autoselect?
*/
+ if (ic->ic_caps & IEEE80211_C_SHPREAMBLE)
+ ic->ic_flags |= IEEE80211_F_SHPREAMBLE;
if (mode == IEEE80211_MODE_11G) {
if (ic->ic_caps & IEEE80211_C_SHSLOT)
ic->ic_flags |= IEEE80211_F_SHSLOT;
- if (ic->ic_caps & IEEE80211_C_SHPREAMBLE)
- ic->ic_flags |= IEEE80211_F_SHPREAMBLE;
ieee80211_set11gbasicrates(&ic->ic_sup_rates[mode],
IEEE80211_MODE_11G);
} else {
- ic->ic_flags &= ~(IEEE80211_F_SHSLOT | IEEE80211_F_SHPREAMBLE);
+ ic->ic_flags &= ~IEEE80211_F_SHSLOT;
}
ic->ic_curmode = mode;