diff options
| author | Jon Maloy <jon.maloy@ericsson.com> | 2018-01-08 21:03:25 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-09 18:35:57 +0100 |
| commit | 0233493a5fad227645f7f02539cb42db72e76030 (patch) | |
| tree | b8e06721bcc705b50eab8caab3d4efe18cd53682 /net/tipc/group.c | |
| parent | tipc: let group member stay in JOINED mode if unable to reclaim (diff) | |
| download | linux-0233493a5fad227645f7f02539cb42db72e76030.tar.xz linux-0233493a5fad227645f7f02539cb42db72e76030.zip | |
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>
Diffstat (limited to 'net/tipc/group.c')
| -rw-r--r-- | net/tipc/group.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/tipc/group.c b/net/tipc/group.c index 652fa66a87f6..a352e098f0e7 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) @@ -690,7 +689,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); |