Module Name: src Committed By: nat Date: Mon Apr 27 07:40:50 UTC 2020
Modified Files: src/sys/net80211 [phil-wifi]: ieee80211_sta.c Log Message: Make ostate reflect the updated state. To generate a diff of this commit: cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/net80211/ieee80211_sta.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/net80211/ieee80211_sta.c diff -u src/sys/net80211/ieee80211_sta.c:1.1.2.6 src/sys/net80211/ieee80211_sta.c:1.1.2.7 --- src/sys/net80211/ieee80211_sta.c:1.1.2.6 Mon Jun 10 22:09:46 2019 +++ src/sys/net80211/ieee80211_sta.c Mon Apr 27 07:40:50 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ieee80211_sta.c,v 1.1.2.6 2019/06/10 22:09:46 christos Exp $ */ +/* $NetBSD: ieee80211_sta.c,v 1.1.2.7 2020/04/27 07:40:50 nat Exp $ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD @@ -29,7 +29,7 @@ #include <sys/cdefs.h> #ifdef __NetBSD__ -__KERNEL_RCSID(0, "$NetBSD: ieee80211_sta.c,v 1.1.2.6 2019/06/10 22:09:46 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ieee80211_sta.c,v 1.1.2.7 2020/04/27 07:40:50 nat Exp $"); #endif @@ -298,6 +298,7 @@ sta_newstate(struct ieee80211vap *vap, e default: break; } + ostate = vap->iv_state; if (ostate != IEEE80211_S_INIT) { /* NB: optimize INIT -> INIT case */ ieee80211_reset_bss(vap); @@ -464,6 +465,7 @@ sta_newstate(struct ieee80211vap *vap, e goto invalid; } ieee80211_sync_curchan(ic); + ostate = vap->iv_state; if (ostate != IEEE80211_S_RUN) sta_swbmiss_start(vap); /*