We simplify the sorting algorithm in tipc_update_member(). We also make the remaining conditional call to this function unconditional, since the same condition now is tested for inside the said function.
Acked-by: Ying Xue <[email protected]> Signed-off-by: Jon Maloy <[email protected]> --- net/tipc/group.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/net/tipc/group.c b/net/tipc/group.c index 6c99511..3e8268d 100644 --- a/net/tipc/group.c +++ b/net/tipc/group.c @@ -356,12 +356,10 @@ void tipc_group_update_member(struct tipc_member *m, int len) /* Sort member into small_window members' list */ list_for_each_entry_safe(_m, tmp, &grp->small_win, small_win) { - if (m->window > _m->window) - continue; - list_add_tail(&m->small_win, &_m->small_win); - return; + if (_m->window > m->window) + break; } - list_add_tail(&m->small_win, &grp->small_win); + list_add_tail(&m->small_win, &_m->small_win); } void tipc_group_update_bc_members(struct tipc_group *grp, int len, bool ack) @@ -851,10 +849,7 @@ void tipc_group_member_evt(struct tipc_group *grp, m->instance = instance; TIPC_SKB_CB(skb)->orig_member = m->instance; tipc_group_proto_xmit(grp, m, GRP_JOIN_MSG, xmitq); - if (m->window < ADV_IDLE) - tipc_group_update_member(m, 0); - else - list_del_init(&m->small_win); + tipc_group_update_member(m, 0); } else if (event == TIPC_WITHDRAWN) { if (!m) goto drop; -- 2.1.4 ------------------------------------------------------------------------------ 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 [email protected] https://lists.sourceforge.net/lists/listinfo/tipc-discussion
