diff --git a/services/net/src/connection_manager.rs b/services/net/src/connection_manager.rs index 7bc3cbd3c..2641e84f9 100644 --- a/services/net/src/connection_manager.rs +++ b/services/net/src/connection_manager.rs @@ -100,6 +100,10 @@ pub(crate) fn connection_manager(sid: xous::SID, activity_interval: Arc msg_scalar_unpack!(msg, _, _, _, _, { - // heh. this probably should be rewritten to be a bit more thread-safe if we had a multi-core CPU we're running on. but we're single-core so... - if activity_interval.fetch_add(current_interval.load(Ordering::SeqCst) as u32, Ordering::SeqCst) > current_interval.load(Ordering::SeqCst) as u32 { + let interval = current_interval.load(Ordering::SeqCst) as u32; + if activity_interval.fetch_add(interval, Ordering::SeqCst) > interval { log::info!("wlan activity interval timeout"); - // if the pddb isn't mounted, don't even bother checking -- we can't connect until we have a place to get keys - if pddb.is_mounted() && rev_ok { + if rev_ok { mounted = true; if last_wifi_state == WifiState::Connected && wifi_state != WifiState::Connected { @@ -313,6 +316,9 @@ pub(crate) fn connection_manager(sid: xous::SID, activity_interval: Arc {