openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tipc: make media address offset a common define 

With the exception of infiniband media which does not use media
offsets, the media address is always located at offset 4 in the
media info field as defined by the protocol, so we move the
definition to the generic bearer.h

Signed-off-by: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Erik Hugne 2015-02-27 08:56:58 +01:00 committed by David S. Miller
parent 91e2eb5684
commit d76a436d50
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/tipc/bearer.h
View File

@ -52,6 +52,7 @@
*/ */
#define TIPC_MEDIA_INFO_SIZE 32 #define TIPC_MEDIA_INFO_SIZE 32
#define TIPC_MEDIA_TYPE_OFFSET 3 #define TIPC_MEDIA_TYPE_OFFSET 3
#define TIPC_MEDIA_ADDR_OFFSET 4
/* /*
* Identifiers of supported TIPC media types * Identifiers of supported TIPC media types

6
net/tipc/eth_media.c
View File

@ -37,8 +37,6 @@
#include "core.h" #include "core.h"
#include "bearer.h" #include "bearer.h"
#define ETH_ADDR_OFFSET 4 /* MAC addr position inside address field */
/* Convert Ethernet address (media address format) to string */ /* Convert Ethernet address (media address format) to string */
static int tipc_eth_addr2str(struct tipc_media_addr *addr, static int tipc_eth_addr2str(struct tipc_media_addr *addr,
char *strbuf, int bufsz) char *strbuf, int bufsz)
@ -55,7 +53,7 @@ static int tipc_eth_addr2msg(char *msg, struct tipc_media_addr *addr)
{ {
memset(msg, 0, TIPC_MEDIA_INFO_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 + TIPC_MEDIA_ADDR_OFFSET, addr->value, ETH_ALEN);
return 0; return 0;
} }
@ -79,7 +77,7 @@ static int tipc_eth_msg2addr(struct tipc_bearer *b,
char *msg) char *msg)
{ {
/* Skip past preamble: */ /* Skip past preamble: */
msg += ETH_ADDR_OFFSET; msg += TIPC_MEDIA_ADDR_OFFSET;
return tipc_eth_raw2addr(b, addr, msg); return tipc_eth_raw2addr(b, addr, msg);
} }