tipc: Eliminate unnecessary constant for neighbor discovery msg size (d901a42b) · Commits · 戴 / test

Eliminates an unnecessary constant that defines the size of a LINK_CONFIG message, and uses one of the existing standard message size symbols in its place. (The defunct constant was located in the wrong place anyway, since it was grouped with other constants that define message users instead of message sizes.) Signed-off-by:

Allan Stephens <Allan.Stephens@windriver.com> Signed-off-by:

Paul Gortmaker <paul.gortmaker@windriver.com>

net/tipc/discover.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -75,12 +75,12 @@ static struct sk_buff *tipc_disc_init_msg(u32 type,
		u32 dest_domain,
		struct tipc_bearer *b_ptr)
		{
		struct sk_buff *buf = tipc_buf_acquire(DSC_H_SIZE);
		struct sk_buff *buf = tipc_buf_acquire(INT_H_SIZE);
		struct tipc_msg *msg;

		if (buf) {
		msg = buf_msg(buf);
		tipc_msg_init(msg, LINK_CONFIG, type, DSC_H_SIZE, dest_domain);
		tipc_msg_init(msg, LINK_CONFIG, type, INT_H_SIZE, dest_domain);
		msg_set_non_seq(msg, 1);
		msg_set_dest_domain(msg, dest_domain);
		msg_set_bc_netid(msg, tipc_net_id);

net/tipc/msg.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -525,7 +525,6 @@ static inline struct tipc_msg msg_get_wrapped(struct tipc_msg m)
		#define NAME_DISTRIBUTOR 11
		#define MSG_FRAGMENTER 12
		#define LINK_CONFIG 13
		#define DSC_H_SIZE 40

		/*
		* Connection management protocol messages

Admin message