From 899921f8db916c35dd684fdfab3b179ee60a4d55 Mon Sep 17 00:00:00 2001 From: Jens Osterkamp Date: Wed, 6 Apr 2011 08:34:07 -0700 Subject: [PATCH 31/51] allow VSI sm state change from ASSOC to PREASSOC_P This is a minor change in the VSI state machine to avoid an assertion if the state changes from ASSOCIATED to PREASSOCIATE_PROCESSING. Signed-off-by: Jens Osterkamp Signed-off-by: John Fastabend Signed-off-by: Petr Sabata --- lldp_vdp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lldp_vdp.c b/lldp_vdp.c index d1adb66..c530c0d 100644 --- a/lldp_vdp.c +++ b/lldp_vdp.c @@ -409,7 +409,8 @@ void vdp_vsi_change_station_state(struct vsi_profile *profile, u8 newstate) break; case VSI_PREASSOC_PROCESSING: assert((profile->state == VSI_PREASSOCIATED) || - profile->state == VSI_UNASSOCIATED); + (profile->state == VSI_ASSOCIATED) || + (profile->state == VSI_UNASSOCIATED)); break; case VSI_PREASSOCIATED: assert((profile->state == VSI_PREASSOC_PROCESSING) || -- 1.7.4.4