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

Commit 38129433 authored by Ying Xue's avatar Ying Xue Committed by David S. Miller
Browse files

tipc: manually inline single use media_name_valid routine 



After eliminating the mechanism which checks whether all letters
in media name string are within a given character set, the
media_name_valid routine becomes trivial.  It is also only
used once, so it is unnecessary to keep it as a separate function.

Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fc073938

net/tipc/bearer.c

+1 −16
Original line number Diff line number Diff line
@@ -48,21 +48,6 @@ struct tipc_bearer tipc_bearers[MAX_BEARERS]; 


static void bearer_disable(struct tipc_bearer *b_ptr);



/**

 * media_name_valid - validate media name

 *

 * Returns 1 if media name is valid, otherwise 0.

 */

static int media_name_valid(const char *name)

{

	u32 len;



	len = strlen(name);

	if ((len + 1) > TIPC_MAX_MEDIA_NAME)

		return 0;

	return 1;

}



/**

 * tipc_media_find - locates specified media object by name

 */
@@ -102,7 +87,7 @@ int tipc_register_media(struct tipc_media *m_ptr) 


	write_lock_bh(&tipc_net_lock);



	if (!media_name_valid(m_ptr->name))

	if ((strlen(m_ptr->name) + 1) > TIPC_MAX_MEDIA_NAME)

		goto exit;

	if ((m_ptr->bcast_addr.media_id != m_ptr->type_id) ||

	    !m_ptr->bcast_addr.broadcast)