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

Commit 0cee6bbe authored by wangweidong's avatar wangweidong Committed by David S. Miller
Browse files

tipc: remove unnecessary variables and conditions 



We remove a number of unnecessary variables and branches
in TIPC. This patch is cosmetic and does not change the
operation of TIPC in any way.

Reviewed-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Reviewed-by: default avatarErik Hugne <erik.hugne@ericsson.com>
Signed-off-by: default avatarWang Weidong <wangweidong1@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 810c23a3

net/tipc/name_table.c

+1 −2
Original line number Diff line number Diff line
@@ -148,8 +148,7 @@ static struct publication *publ_create(u32 type, u32 lower, u32 upper, 
 */

static struct sub_seq *tipc_subseq_alloc(u32 cnt)

{

	struct sub_seq *sseq = kcalloc(cnt, sizeof(struct sub_seq), GFP_ATOMIC);

	return sseq;

	return kcalloc(cnt, sizeof(struct sub_seq), GFP_ATOMIC);

}



/**

net/tipc/port.c

+3 −6
Original line number Diff line number Diff line
@@ -832,17 +832,14 @@ int __tipc_connect(u32 ref, struct tipc_port *p_ptr, 
 */

int __tipc_disconnect(struct tipc_port *tp_ptr)

{

	int res;



	if (tp_ptr->connected) {

		tp_ptr->connected = 0;

		/* let timer expire on it's own to avoid deadlock! */

		tipc_nodesub_unsubscribe(&tp_ptr->subscription);

		res = 0;

	} else {

		res = -ENOTCONN;

		return 0;

	}

	return res;



	return -ENOTCONN;

}



/*

net/tipc/socket.c

+4 −9
Original line number Diff line number Diff line
@@ -239,7 +239,6 @@ static int tipc_sk_create(struct net *net, struct socket *sock, int protocol, 
int tipc_sock_create_local(int type, struct socket **res)

{

	int rc;

	struct sock *sk;



	rc = sock_create_lite(AF_TIPC, type, 0, res);

	if (rc < 0) {
@@ -248,8 +247,6 @@ int tipc_sock_create_local(int type, struct socket **res) 
	}

	tipc_sk_create(&init_net, *res, 0, 1);



	sk = (*res)->sk;



	return 0;

}
@@ -1311,14 +1308,12 @@ static u32 filter_connect(struct tipc_sock *tsock, struct sk_buff **buf) 
static unsigned int rcvbuf_limit(struct sock *sk, struct sk_buff *buf)

{

	struct tipc_msg *msg = buf_msg(buf);

	unsigned int limit;



	if (msg_connected(msg))

		limit = sysctl_tipc_rmem[2];

	else

		limit = sk->sk_rcvbuf >> TIPC_CRITICAL_IMPORTANCE <<

		return sysctl_tipc_rmem[2];



	return sk->sk_rcvbuf >> TIPC_CRITICAL_IMPORTANCE <<

		msg_importance(msg);

	return limit;

}



/**