diff options
Diffstat (limited to 'net/tipc/eth_media.c')
-rw-r--r-- | net/tipc/eth_media.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c index 5e1426f1751f..f69a2fde9f4a 100644 --- a/net/tipc/eth_media.c +++ b/net/tipc/eth_media.c | |||
@@ -37,8 +37,6 @@ | |||
37 | #include "core.h" | 37 | #include "core.h" |
38 | #include "bearer.h" | 38 | #include "bearer.h" |
39 | 39 | ||
40 | #define ETH_ADDR_OFFSET 4 /* MAC addr position inside address field */ | ||
41 | |||
42 | /* Convert Ethernet address (media address format) to string */ | 40 | /* Convert Ethernet address (media address format) to string */ |
43 | static int tipc_eth_addr2str(struct tipc_media_addr *addr, | 41 | static int tipc_eth_addr2str(struct tipc_media_addr *addr, |
44 | char *strbuf, int bufsz) | 42 | char *strbuf, int bufsz) |
@@ -53,9 +51,9 @@ static int tipc_eth_addr2str(struct tipc_media_addr *addr, | |||
53 | /* Convert from media address format to discovery message addr format */ | 51 | /* Convert from media address format to discovery message addr format */ |
54 | static int tipc_eth_addr2msg(char *msg, struct tipc_media_addr *addr) | 52 | static int tipc_eth_addr2msg(char *msg, struct tipc_media_addr *addr) |
55 | { | 53 | { |
56 | memset(msg, 0, TIPC_MEDIA_ADDR_SIZE); | 54 | memset(msg, 0, TIPC_MEDIA_INFO_SIZE); |
57 | msg[TIPC_MEDIA_TYPE_OFFSET] = TIPC_MEDIA_TYPE_ETH; | 55 | msg[TIPC_MEDIA_TYPE_OFFSET] = TIPC_MEDIA_TYPE_ETH; |
58 | memcpy(msg + ETH_ADDR_OFFSET, addr->value, ETH_ALEN); | 56 | memcpy(msg + TIPC_MEDIA_ADDR_OFFSET, addr->value, ETH_ALEN); |
59 | return 0; | 57 | return 0; |
60 | } | 58 | } |
61 | 59 | ||
@@ -79,7 +77,7 @@ static int tipc_eth_msg2addr(struct tipc_bearer *b, | |||
79 | char *msg) | 77 | char *msg) |
80 | { | 78 | { |
81 | /* Skip past preamble: */ | 79 | /* Skip past preamble: */ |
82 | msg += ETH_ADDR_OFFSET; | 80 | msg += TIPC_MEDIA_ADDR_OFFSET; |
83 | return tipc_eth_raw2addr(b, addr, msg); | 81 | return tipc_eth_raw2addr(b, addr, msg); |
84 | } | 82 | } |
85 | 83 | ||