Commit 91e2eb56 authored by Erik Hugne's avatar Erik Hugne Committed by David S. Miller
Browse files

tipc: rename media/msg related definitions 



The TIPC_MEDIA_ADDR_SIZE and TIPC_MEDIA_ADDR_OFFSET names
are misleading, as they actually define the size and offset of
the whole media info field and not the address part. This patch
does not have any functional changes.

Signed-off-by: default avatarErik Hugne <erik.hugne@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent afaa3f65

net/tipc/bearer.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -50,7 +50,7 @@ 
 * - the field's actual content and length is defined per media

 * - the field's actual content and length is defined per media

 * - remaining unused bytes in the field are set to zero

 * - remaining unused bytes in the field are set to zero

 */

 */

#define TIPC_MEDIA_ADDR_SIZE	32

#define TIPC_MEDIA_INFO_SIZE	32

#define TIPC_MEDIA_TYPE_OFFSET	3

#define TIPC_MEDIA_TYPE_OFFSET	3





/*

/*
@@ -76,7 +76,7 @@ struct tipc_node_map { 
 * @broadcast: non-zero if address is a broadcast address

 * @broadcast: non-zero if address is a broadcast address

 */

 */

struct tipc_media_addr {

struct tipc_media_addr {

	u8 value[TIPC_MEDIA_ADDR_SIZE];

	u8 value[TIPC_MEDIA_INFO_SIZE];

	u8 media_id;

	u8 media_id;

	u8 broadcast;

	u8 broadcast;

};

};

net/tipc/eth_media.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ static int tipc_eth_addr2str(struct tipc_media_addr *addr, 
/* Convert from media address format to discovery message addr format */

/* Convert from media address format to discovery message addr format */

static int tipc_eth_addr2msg(char *msg, struct tipc_media_addr *addr)

static int tipc_eth_addr2msg(char *msg, struct tipc_media_addr *addr)

{

{

	memset(msg, 0, TIPC_MEDIA_ADDR_SIZE);

	memset(msg, 0, TIPC_MEDIA_INFO_SIZE);

	msg[TIPC_MEDIA_TYPE_OFFSET] = TIPC_MEDIA_TYPE_ETH;

	msg[TIPC_MEDIA_TYPE_OFFSET] = TIPC_MEDIA_TYPE_ETH;

	memcpy(msg + ETH_ADDR_OFFSET, addr->value, ETH_ALEN);

	memcpy(msg + ETH_ADDR_OFFSET, addr->value, ETH_ALEN);

	return 0;

	return 0;

net/tipc/ib_media.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ static int tipc_ib_addr2str(struct tipc_media_addr *a, char *str_buf, 
/* Convert from media address format to discovery message addr format */

/* Convert from media address format to discovery message addr format */

static int tipc_ib_addr2msg(char *msg, struct tipc_media_addr *addr)

static int tipc_ib_addr2msg(char *msg, struct tipc_media_addr *addr)

{

{

	memset(msg, 0, TIPC_MEDIA_ADDR_SIZE);

	memset(msg, 0, TIPC_MEDIA_INFO_SIZE);

	memcpy(msg, addr->value, INFINIBAND_ALEN);

	memcpy(msg, addr->value, INFINIBAND_ALEN);

	return 0;

	return 0;

}

}

net/tipc/msg.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ struct plist; 




#define MAX_MSG_SIZE (MAX_H_SIZE + TIPC_MAX_USER_MSG_SIZE)

#define MAX_MSG_SIZE (MAX_H_SIZE + TIPC_MAX_USER_MSG_SIZE)





#define TIPC_MEDIA_ADDR_OFFSET	5

#define TIPC_MEDIA_INFO_OFFSET	5





/**

/**

 * TIPC message buffer code

 * TIPC message buffer code
@@ -688,7 +688,7 @@ static inline void msg_set_redundant_link(struct tipc_msg *m, u32 r) 




static inline char *msg_media_addr(struct tipc_msg *m)

static inline char *msg_media_addr(struct tipc_msg *m)

{

{

	return (char *)&m->hdr[TIPC_MEDIA_ADDR_OFFSET];

	return (char *)&m->hdr[TIPC_MEDIA_INFO_OFFSET];

}

}





/*

/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE