Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0233493a5fad227645f7f02539cb42db72e76030

Authored by Jon Maloy
Committed by David S. Miller
1 parent 4ea5dab541

tipc: adjustment to group member FSM 

Analysis reveals that the member state MBR_QURANTINED in reality is
unnecessary, and can be replaced by the state MBR_JOINING at all
occurrencs.

Acked-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 2 additions and 3 deletions Side-by-side Diff

... ... @@ -49,7 +49,6 @@
49 49 #define ADV_ACTIVE (ADV_UNIT * 12)
50 50  
51 51 enum mbr_state {
52   - MBR_QUARANTINED,
53 52 MBR_DISCOVERED,
54 53 MBR_JOINING,
55 54 MBR_PUBLISHED,
... ... @@ -138,7 +137,7 @@
138 137  
139 138 static bool tipc_group_is_receiver(struct tipc_member *m)
140 139 {
141   - return m->state != MBR_QUARANTINED && m->state != MBR_LEAVING;
  140 + return m && m->state != MBR_JOINING && m->state != MBR_LEAVING;
142 141 }
143 142  
144 143 static bool tipc_group_is_sender(struct tipc_member *m)
... ... @@ -690,7 +689,7 @@
690 689 case GRP_JOIN_MSG:
691 690 if (!m)
692 691 m = tipc_group_create_member(grp, node, port,
693   - MBR_QUARANTINED);
  692 + MBR_JOINING);
694 693 if (!m)
695 694 return;
696 695 m->bc_syncpt = msg_grp_bc_syncpt(hdr);