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>

diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index 1a233271d1b59cbe86d8e67a687b99dca17d70ea..097aff08ad5b056f3fed74079d6ad8b030f98219 100644 (file)
--- a/net/tipc/bearer.h
+++ b/net/tipc/bearer.h
@@ -52,6 +52,7 @@
  */
 #define TIPC_MEDIA_INFO_SIZE   32
 #define TIPC_MEDIA_TYPE_OFFSET 3
+#define TIPC_MEDIA_ADDR_OFFSET 4
 
 /*
  * Identifiers of supported TIPC media types

diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index 085d3a07e565958f723abd507db05c71d8b02d8c..f69a2fde9f4a065472f1a14aeee22c6380e07fa4 100644 (file)
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -37,8 +37,6 @@
 #include "core.h"
 #include "bearer.h"
 
-#define ETH_ADDR_OFFSET  4  /* MAC addr position inside address field */
-
 /* Convert Ethernet address (media address format) to string */
 static int tipc_eth_addr2str(struct tipc_media_addr *addr,
                             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);
        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;
 }
 
@@ -79,7 +77,7 @@ static int tipc_eth_msg2addr(struct tipc_bearer *b,
                             char *msg)
 {
        /* Skip past preamble: */
-       msg += ETH_ADDR_OFFSET;
+       msg += TIPC_MEDIA_ADDR_OFFSET;
        return tipc_eth_raw2addr(b, addr, msg);
 }