aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/eth_media.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2013-04-17 02:18:25 -0400
committerDavid S. Miller <davem@davemloft.net>2013-04-17 14:18:33 -0400
commitccc4ba2ea23e4507c174620405c5de7bee328f99 (patch)
tree41e695e48159c1703faad8e16321a686c68a4568 /net/tipc/eth_media.c
parenta6bda459fafd5d017e4a9505d08fe72de5fcdef3 (diff)
tipc: remove unused str2addr media callback
Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/eth_media.c')
-rw-r--r--net/tipc/eth_media.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index 2132c1ef2951..1bdc6df0a79e 100644
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -302,25 +302,6 @@ static int eth_addr2str(struct tipc_media_addr *a, char *str_buf, int str_size)
302} 302}
303 303
304/** 304/**
305 * eth_str2addr - convert string to Ethernet address
306 */
307static int eth_str2addr(struct tipc_media_addr *a, char *str_buf)
308{
309 char mac[ETH_ALEN];
310 int r;
311
312 r = sscanf(str_buf, "%02x:%02x:%02x:%02x:%02x:%02x",
313 (u32 *)&mac[0], (u32 *)&mac[1], (u32 *)&mac[2],
314 (u32 *)&mac[3], (u32 *)&mac[4], (u32 *)&mac[5]);
315
316 if (r != ETH_ALEN)
317 return 1;
318
319 eth_media_addr_set(a, mac);
320 return 0;
321}
322
323/**
324 * eth_str2addr - convert Ethernet address format to message header format 305 * eth_str2addr - convert Ethernet address format to message header format
325 */ 306 */
326static int eth_addr2msg(struct tipc_media_addr *a, char *msg_area) 307static int eth_addr2msg(struct tipc_media_addr *a, char *msg_area)
@@ -351,7 +332,6 @@ static struct tipc_media eth_media_info = {
351 .enable_bearer = enable_bearer, 332 .enable_bearer = enable_bearer,
352 .disable_bearer = disable_bearer, 333 .disable_bearer = disable_bearer,
353 .addr2str = eth_addr2str, 334 .addr2str = eth_addr2str,
354 .str2addr = eth_str2addr,
355 .addr2msg = eth_addr2msg, 335 .addr2msg = eth_addr2msg,
356 .msg2addr = eth_msg2addr, 336 .msg2addr = eth_msg2addr,
357 .bcast_addr = { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, 337 .bcast_addr = { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },