Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8af4638a authored by Allan Stephens's avatar Allan Stephens Committed by Paul Gortmaker
Browse files

tipc: Eliminate checks for empty zone list during name translation 



Gets rid of a pair of checks to see if a name sequence entry in
TIPC's name table has an empty zone list. These checks are pointless
since the zone list can never be empty (i.e. as soon as the list
becomes empty the associated name sequence entry is deleted).

Signed-off-by: default avatarAllan Stephens <allan.stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent f6f0a4d2

net/tipc/name_table.c

+2 −5
Original line number Diff line number Diff line
@@ -574,14 +574,13 @@ u32 tipc_nametbl_translate(u32 type, u32 instance, u32 *destnode) 
						cluster_list);

			list_move_tail(&publ->cluster_list,

				       &info->cluster_list);

		} else if (!list_empty(&info->zone_list)) {

		} else {

			publ = list_first_entry(&info->zone_list,

						struct publication,

						zone_list);

			list_move_tail(&publ->zone_list,

				       &info->zone_list);

		} else

			goto no_match;

		}

	}



	/* Round-Robin Algorithm: */
@@ -598,8 +597,6 @@ u32 tipc_nametbl_translate(u32 type, u32 instance, u32 *destnode) 
					cluster_list);

		list_move_tail(&publ->cluster_list, &info->cluster_list);

	} else {

		if (list_empty(&info->zone_list))

			goto no_match;

		publ = list_first_entry(&info->zone_list, struct publication,

					zone_list);

		list_move_tail(&publ->zone_list, &info->zone_list);