station: fix unintended netconfig_reset pre-roaming

Commit Message

James Prestwood Oct. 20, 2023, 12:50 p.m. UTC

Commit 23f0f5717c did not correctly handle the reassociation
case where the state is set from within station_try_next_transition.
If IWD reassociates netconfig will get reset and DHCP will need to
be done over again after the roam. Instead get the state ahead of
station_try_next_transition.
---
 src/station.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Denis Kenzior Oct. 20, 2023, 3:23 p.m. UTC | #1

Hi James,

On 10/20/23 07:50, James Prestwood wrote:
> Commit 23f0f5717c did not correctly handle the reassociation
> case where the state is set from within station_try_next_transition.
> If IWD reassociates netconfig will get reset and DHCP will need to
> be done over again after the roam. Instead get the state ahead of
> station_try_next_transition.
> ---
>   src/station.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)

Applied, thanks.

Regards,
-Denis

Patch

diff --git a/src/station.c b/src/station.c
index f24b9aca..e18847bc 100644
--- a/src/station.c
+++ b/src/station.c
@@ -2470,6 +2470,7 @@  static void station_transition_start(struct station *station)
 {
 	struct roam_bss *rbss;
 	bool roaming = false;
+	bool connected = (station->state == STATION_STATE_CONNECTED);
 
 	/*
 	 * For each failed attempt pop the BSS leaving the head of the queue
@@ -2498,7 +2499,7 @@  static void station_transition_start(struct station *station)
 	 * still should roam in this case but need to restart netconfig once the
 	 * roam is finished.
 	 */
-	if (station->netconfig && station->state != STATION_STATE_CONNECTED) {
+	if (station->netconfig && !connected) {
 		netconfig_reset(station->netconfig);
 		station->netconfig_after_roam = true;
 	}