aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorSam Leffler <sam@FreeBSD.org>2005-11-30 19:54:41 +0000
committerSam Leffler <sam@FreeBSD.org>2005-11-30 19:54:41 +0000
commitf219c9d3d33babf9cb8d4ec26f284fa8155e3ac7 (patch)
tree41c2c72c3790c34dcea53cc544c79c5e9ceb02ff /sys
parent8a4a44b5aa46c9d035ba939da61881d622ad5f12 (diff)
downloadsrc-f219c9d3d33babf9cb8d4ec26f284fa8155e3ac7.tar.gz
src-f219c9d3d33babf9cb8d4ec26f284fa8155e3ac7.zip
fix dynamic changes in short slottime for 11g sta mode: set the
slot time based on the rcvd capabilities, not the existing ones Obtained from: atheros MFC after: 1 week
Notes
Notes: svn path=/head/; revision=152968
Diffstat (limited to 'sys')
-rw-r--r--sys/net80211/ieee80211_input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index 74b147e21660..02232b61807f 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -1923,7 +1923,7 @@ ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0,
*/
ieee80211_set_shortslottime(ic,
ic->ic_curmode == IEEE80211_MODE_11A ||
- (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME));
+ (scan.capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME));
ni->ni_capinfo = scan.capinfo;
/* XXX statistic */
}