diff options
| author | Patrick McHardy <kaber@trash.net> | 2013-04-17 06:18:25 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-17 14:18:33 -0400 |
| commit | ccc4ba2ea23e4507c174620405c5de7bee328f99 (patch) | |
| tree | 41e695e48159c1703faad8e16321a686c68a4568 /net/tipc | |
| parent | a6bda459fafd5d017e4a9505d08fe72de5fcdef3 (diff) | |
| download | linux-ccc4ba2ea23e4507c174620405c5de7bee328f99.tar.gz linux-ccc4ba2ea23e4507c174620405c5de7bee328f99.tar.bz2 linux-ccc4ba2ea23e4507c174620405c5de7bee328f99.zip | |
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')
| -rw-r--r-- | net/tipc/bearer.h | 2 | ||||
| -rw-r--r-- | net/tipc/eth_media.c | 20 |
2 files changed, 0 insertions, 22 deletions
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h index 39f1192d04bf..cc2d74e1f9f7 100644 --- a/net/tipc/bearer.h +++ b/net/tipc/bearer.h @@ -77,7 +77,6 @@ struct tipc_bearer; * @enable_bearer: routine which enables a bearer * @disable_bearer: routine which disables a bearer * @addr2str: routine which converts media address to string - * @str2addr: routine which converts media address from string * @addr2msg: routine which converts media address to protocol message area * @msg2addr: routine which converts media address from protocol message area * @bcast_addr: media address used in broadcasting @@ -94,7 +93,6 @@ struct tipc_media { int (*enable_bearer)(struct tipc_bearer *b_ptr); void (*disable_bearer)(struct tipc_bearer *b_ptr); int (*addr2str)(struct tipc_media_addr *a, char *str_buf, int str_size); - int (*str2addr)(struct tipc_media_addr *a, char *str_buf); int (*addr2msg)(struct tipc_media_addr *a, char *msg_area); int (*msg2addr)(struct tipc_media_addr *a, char *msg_area); struct tipc_media_addr bcast_addr; 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) } /** - * eth_str2addr - convert string to Ethernet address - */ -static int eth_str2addr(struct tipc_media_addr *a, char *str_buf) -{ - char mac[ETH_ALEN]; - int r; - - r = sscanf(str_buf, "%02x:%02x:%02x:%02x:%02x:%02x", - (u32 *)&mac[0], (u32 *)&mac[1], (u32 *)&mac[2], - (u32 *)&mac[3], (u32 *)&mac[4], (u32 *)&mac[5]); - - if (r != ETH_ALEN) - return 1; - - eth_media_addr_set(a, mac); - return 0; -} - -/** * eth_str2addr - convert Ethernet address format to message header format */ static int eth_addr2msg(struct tipc_media_addr *a, char *msg_area) @@ -351,7 +332,6 @@ static struct tipc_media eth_media_info = { .enable_bearer = enable_bearer, .disable_bearer = disable_bearer, .addr2str = eth_addr2str, - .str2addr = eth_str2addr, .addr2msg = eth_addr2msg, .msg2addr = eth_msg2addr, .bcast_addr = { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, |