diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-07-16 17:09:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-07-16 17:09:22 -0700 |
| commit | ae8e9c5a1a7889315229a741fd48a5dd0bc2964c (patch) | |
| tree | 6ea199fad466af8253da9ae617ce112bb182ee43 /net/ethernet | |
| parent | be2net: Fix to avoid hardware workaround when not needed (diff) | |
| download | linux-dev-ae8e9c5a1a7889315229a741fd48a5dd0bc2964c.tar.xz linux-dev-ae8e9c5a1a7889315229a741fd48a5dd0bc2964c.zip | |
net: Fix sysfs_format_mac() code duplication.
It's just a duplicate implementation of "%*phC". Thanks to Joe
Perches for showing that we had exactly this support in the
lib/vsprintf.c code already.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ethernet')
| -rw-r--r-- | net/ethernet/eth.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index 5359560926bc..be1f64d35358 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c @@ -401,27 +401,8 @@ struct net_device *alloc_etherdev_mqs(int sizeof_priv, unsigned int txqs, } EXPORT_SYMBOL(alloc_etherdev_mqs); -static size_t _format_mac_addr(char *buf, int buflen, - const unsigned char *addr, int len) -{ - int i; - char *cp = buf; - - for (i = 0; i < len; i++) { - cp += scnprintf(cp, buflen - (cp - buf), "%02x", addr[i]); - if (i == len - 1) - break; - cp += scnprintf(cp, buflen - (cp - buf), ":"); - } - return cp - buf; -} - ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len) { - size_t l; - - l = _format_mac_addr(buf, PAGE_SIZE, addr, len); - l += scnprintf(buf + l, PAGE_SIZE - l, "\n"); - return (ssize_t)l; + return scnprintf(buf, PAGE_SIZE, "%*phC\n", len, addr); } EXPORT_SYMBOL(sysfs_format_mac); |