aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2007-12-25 00:28:09 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:00:05 -0500
commit7ffc49a6ee92b7138c2ee28073a8e10e58335d62 (patch)
tree6421d389980f3a71b1b53ed6e1548eb08dbf1226 /net/core
parent21371f768bf7127ee45bfaadd17899df6a439e8f (diff)
[ETH]: Combine format_addr() with print_mac().
print_mac() used many most net drivers and format_addr() used by net-sysfs.c are very similar and they can be intergrated. format_addr() is also identically redefined in the qla4xxx iscsi driver. Export a new function sysfs_format_mac() to be used by net-sysfs, qla4xxx and others in the future. Both print_mac() and sysfs_format_mac() call _format_mac_addr() to do the formatting. Changed print_mac() to use unsigned char * to be consistent with net_device struct's dev_addr. Added buffer length overrun checking as suggested by Joe Perches. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/net-sysfs.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index e41f4b9d2e7..7635d3f7272 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -95,17 +95,6 @@ NETDEVICE_SHOW(type, fmt_dec);
95NETDEVICE_SHOW(link_mode, fmt_dec); 95NETDEVICE_SHOW(link_mode, fmt_dec);
96 96
97/* use same locking rules as GIFHWADDR ioctl's */ 97/* use same locking rules as GIFHWADDR ioctl's */
98static ssize_t format_addr(char *buf, const unsigned char *addr, int len)
99{
100 int i;
101 char *cp = buf;
102
103 for (i = 0; i < len; i++)
104 cp += sprintf(cp, "%02x%c", addr[i],
105 i == (len - 1) ? '\n' : ':');
106 return cp - buf;
107}
108
109static ssize_t show_address(struct device *dev, struct device_attribute *attr, 98static ssize_t show_address(struct device *dev, struct device_attribute *attr,
110 char *buf) 99 char *buf)
111{ 100{
@@ -114,7 +103,7 @@ static ssize_t show_address(struct device *dev, struct device_attribute *attr,
114 103
115 read_lock(&dev_base_lock); 104 read_lock(&dev_base_lock);
116 if (dev_isalive(net)) 105 if (dev_isalive(net))
117 ret = format_addr(buf, net->dev_addr, net->addr_len); 106 ret = sysfs_format_mac(buf, net->dev_addr, net->addr_len);
118 read_unlock(&dev_base_lock); 107 read_unlock(&dev_base_lock);
119 return ret; 108 return ret;
120} 109}
@@ -124,7 +113,7 @@ static ssize_t show_broadcast(struct device *dev,
124{ 113{
125 struct net_device *net = to_net_dev(dev); 114 struct net_device *net = to_net_dev(dev);
126 if (dev_isalive(net)) 115 if (dev_isalive(net))
127 return format_addr(buf, net->broadcast, net->addr_len); 116 return sysfs_format_mac(buf, net->broadcast, net->addr_len);
128 return -EINVAL; 117 return -EINVAL;
129} 118}
130 119