On 12/23/2017 04:50 AM, Jon Maloy wrote: > Analysis reveals that the member state MBR_QURANTINED in reality is > unnecessary, and can be replaced by the state MBR_JOINING at all > places it is ocurring.
s/ocurring/occurring It will be very much useful for other developers if you can show how the new group member FSM looks like. > > Signed-off-by: Jon Maloy <jon.ma...@ericsson.com> > --- > net/tipc/group.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/net/tipc/group.c b/net/tipc/group.c > index fb7fe97..1e2b716 100644 > --- a/net/tipc/group.c > +++ b/net/tipc/group.c > @@ -49,7 +49,6 @@ > #define ADV_ACTIVE (ADV_UNIT * 12) > > enum mbr_state { > - MBR_QUARANTINED, > MBR_DISCOVERED, > MBR_JOINING, > MBR_PUBLISHED, > @@ -138,7 +137,7 @@ u16 tipc_group_bc_snd_nxt(struct tipc_group *grp) > > static bool tipc_group_is_receiver(struct tipc_member *m) > { > - return m->state != MBR_QUARANTINED && m->state != MBR_LEAVING; > + return m && m->state != MBR_JOINING && m->state != MBR_LEAVING; > } > > static bool tipc_group_is_sender(struct tipc_member *m) > @@ -670,7 +669,7 @@ void tipc_group_proto_rcv(struct tipc_group *grp, bool > *usr_wakeup, > case GRP_JOIN_MSG: > if (!m) > m = tipc_group_create_member(grp, node, port, > - MBR_QUARANTINED); > + MBR_JOINING); > if (!m) > return; > m->bc_syncpt = msg_grp_bc_syncpt(hdr); > ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ tipc-discussion mailing list tipc-discussion@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tipc-discussion