summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authordamien <damien@openbsd.org>2006-08-19 12:38:16 +0000
committerdamien <damien@openbsd.org>2006-08-19 12:38:16 +0000
commitef22fdfe673d4f31fe08d5fa62f7dd305ea24f15 (patch)
tree40b6614d740480643d2065d5271e41263f0d5534 /sys
parentget rid of shared auth mode. (diff)
downloadwireguard-openbsd-ef22fdfe673d4f31fe08d5fa62f7dd305ea24f15.tar.xz
wireguard-openbsd-ef22fdfe673d4f31fe08d5fa62f7dd305ea24f15.zip
move computation of mbps after checking the value of ni->ni_txrate
Diffstat (limited to 'sys')
-rw-r--r--sys/net80211/ieee80211_proto.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c
index a25e148f604..771dfe9019e 100644
--- a/sys/net80211/ieee80211_proto.c
+++ b/sys/net80211/ieee80211_proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_proto.c,v 1.10 2006/06/18 18:39:41 damien Exp $ */
+/* $OpenBSD: ieee80211_proto.c,v 1.11 2006/08/19 12:38:16 damien Exp $ */
/* $NetBSD: ieee80211_proto.c,v 1.8 2004/04/30 23:58:20 dyoung Exp $ */
/*-
@@ -363,7 +363,6 @@ ieee80211_newstate(struct ieee80211com *ic, enum ieee80211_state nstate,
ieee80211_state_name[ostate], ieee80211_state_name[nstate]));
ic->ic_state = nstate; /* state transition */
ni = ic->ic_bss; /* NB: no reference held */
- mbps = IEEE80211_RATE2MBS(ni->ni_rates.rs_rates[ni->ni_txrate]);
switch (nstate) {
case IEEE80211_S_INIT:
switch (ostate) {
@@ -551,6 +550,8 @@ ieee80211_newstate(struct ieee80211com *ic, enum ieee80211_state nstate,
ether_sprintf(ni->ni_bssid));
ieee80211_print_essid(ic->ic_bss->ni_essid,
ni->ni_esslen);
+ mbps = IEEE80211_RATE2MBS(
+ ni->ni_rates.rs_rates[ni->ni_txrate]);
printf(" channel %d start %uMb",
ieee80211_chan2ieee(ic, ni->ni_chan), mbps);
printf(" %s preamble %s slot time%s\n",