* [PATCH v1] bridge: Use helpers to handle MAC address
@ 2017-12-19 18:10 Andy Shevchenko
2017-12-19 18:32 ` Stephen Hemminger
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Andy Shevchenko @ 2017-12-19 18:10 UTC (permalink / raw)
To: Stephen Hemminger, David S. Miller, bridge, netdev; +Cc: Andy Shevchenko
Use
%pM to print MAC
mac_pton() to convert it from ASCII to binary format, and
ether_addr_copy() to copy.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
net/bridge/br_sysfs_br.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index 723f25eed8ea..b1be0dcfba6b 100644
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -272,10 +272,7 @@ static ssize_t group_addr_show(struct device *d,
struct device_attribute *attr, char *buf)
{
struct net_bridge *br = to_bridge(d);
- return sprintf(buf, "%x:%x:%x:%x:%x:%x\n",
- br->group_addr[0], br->group_addr[1],
- br->group_addr[2], br->group_addr[3],
- br->group_addr[4], br->group_addr[5]);
+ return sprintf(buf, "%pM\n", br->group_addr);
}
static ssize_t group_addr_store(struct device *d,
@@ -284,14 +281,11 @@ static ssize_t group_addr_store(struct device *d,
{
struct net_bridge *br = to_bridge(d);
u8 new_addr[6];
- int i;
if (!ns_capable(dev_net(br->dev)->user_ns, CAP_NET_ADMIN))
return -EPERM;
- if (sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
- &new_addr[0], &new_addr[1], &new_addr[2],
- &new_addr[3], &new_addr[4], &new_addr[5]) != 6)
+ if (!mac_pton(buf, new_addr))
return -EINVAL;
if (!is_link_local_ether_addr(new_addr))
@@ -306,8 +300,7 @@ static ssize_t group_addr_store(struct device *d,
return restart_syscall();
spin_lock_bh(&br->lock);
- for (i = 0; i < 6; i++)
- br->group_addr[i] = new_addr[i];
+ ether_addr_copy(br->group_addr, new_addr);
spin_unlock_bh(&br->lock);
br->group_addr_set = true;
--
2.15.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v1] bridge: Use helpers to handle MAC address
2017-12-19 18:10 [PATCH v1] bridge: Use helpers to handle MAC address Andy Shevchenko
@ 2017-12-19 18:32 ` Stephen Hemminger
2017-12-19 19:21 ` Randy Dunlap
2017-12-20 17:46 ` David Miller
2 siblings, 0 replies; 5+ messages in thread
From: Stephen Hemminger @ 2017-12-19 18:32 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: David S. Miller, bridge, netdev
On Tue, 19 Dec 2017 20:10:53 +0200
Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
> Use
> %pM to print MAC
> mac_pton() to convert it from ASCII to binary format, and
> ether_addr_copy() to copy.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Looks good
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v1] bridge: Use helpers to handle MAC address
2017-12-19 18:10 [PATCH v1] bridge: Use helpers to handle MAC address Andy Shevchenko
2017-12-19 18:32 ` Stephen Hemminger
@ 2017-12-19 19:21 ` Randy Dunlap
2017-12-19 19:33 ` Andy Shevchenko
2017-12-20 17:46 ` David Miller
2 siblings, 1 reply; 5+ messages in thread
From: Randy Dunlap @ 2017-12-19 19:21 UTC (permalink / raw)
To: Andy Shevchenko, Stephen Hemminger, David S. Miller, bridge,
netdev
On 12/19/2017 10:10 AM, Andy Shevchenko wrote:
> Use
> %pM to print MAC
> mac_pton() to convert it from ASCII to binary format, and
> ether_addr_copy() to copy.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
(same)
select GENERIC_NET_UTILS
?
> ---
> net/bridge/br_sysfs_br.c | 13 +++----------
> 1 file changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
> index 723f25eed8ea..b1be0dcfba6b 100644
> --- a/net/bridge/br_sysfs_br.c
> +++ b/net/bridge/br_sysfs_br.c
> @@ -272,10 +272,7 @@ static ssize_t group_addr_show(struct device *d,
> struct device_attribute *attr, char *buf)
> {
> struct net_bridge *br = to_bridge(d);
> - return sprintf(buf, "%x:%x:%x:%x:%x:%x\n",
> - br->group_addr[0], br->group_addr[1],
> - br->group_addr[2], br->group_addr[3],
> - br->group_addr[4], br->group_addr[5]);
> + return sprintf(buf, "%pM\n", br->group_addr);
> }
>
> static ssize_t group_addr_store(struct device *d,
> @@ -284,14 +281,11 @@ static ssize_t group_addr_store(struct device *d,
> {
> struct net_bridge *br = to_bridge(d);
> u8 new_addr[6];
> - int i;
>
> if (!ns_capable(dev_net(br->dev)->user_ns, CAP_NET_ADMIN))
> return -EPERM;
>
> - if (sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
> - &new_addr[0], &new_addr[1], &new_addr[2],
> - &new_addr[3], &new_addr[4], &new_addr[5]) != 6)
> + if (!mac_pton(buf, new_addr))
> return -EINVAL;
>
> if (!is_link_local_ether_addr(new_addr))
> @@ -306,8 +300,7 @@ static ssize_t group_addr_store(struct device *d,
> return restart_syscall();
>
> spin_lock_bh(&br->lock);
> - for (i = 0; i < 6; i++)
> - br->group_addr[i] = new_addr[i];
> + ether_addr_copy(br->group_addr, new_addr);
> spin_unlock_bh(&br->lock);
>
> br->group_addr_set = true;
>
--
~Randy
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v1] bridge: Use helpers to handle MAC address
2017-12-19 19:21 ` Randy Dunlap
@ 2017-12-19 19:33 ` Andy Shevchenko
0 siblings, 0 replies; 5+ messages in thread
From: Andy Shevchenko @ 2017-12-19 19:33 UTC (permalink / raw)
To: Randy Dunlap, Stephen Hemminger, David S. Miller, bridge, netdev
On Tue, 2017-12-19 at 11:21 -0800, Randy Dunlap wrote:
> On 12/19/2017 10:10 AM, Andy Shevchenko wrote:
> > Use
> > %pM to print MAC
> > mac_pton() to convert it from ASCII to binary format, and
> > ether_addr_copy() to copy.
> >
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>
> (same)
> select GENERIC_NET_UTILS
> ?
(same)
Done by CONFIG_NET.
>
> > ---
> > net/bridge/br_sysfs_br.c | 13 +++----------
> > 1 file changed, 3 insertions(+), 10 deletions(-)
> >
> > diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
> > index 723f25eed8ea..b1be0dcfba6b 100644
> > --- a/net/bridge/br_sysfs_br.c
> > +++ b/net/bridge/br_sysfs_br.c
> > @@ -272,10 +272,7 @@ static ssize_t group_addr_show(struct device
> > *d,
> > struct device_attribute *attr, char
> > *buf)
> > {
> > struct net_bridge *br = to_bridge(d);
> > - return sprintf(buf, "%x:%x:%x:%x:%x:%x\n",
> > - br->group_addr[0], br->group_addr[1],
> > - br->group_addr[2], br->group_addr[3],
> > - br->group_addr[4], br->group_addr[5]);
> > + return sprintf(buf, "%pM\n", br->group_addr);
> > }
> >
> > static ssize_t group_addr_store(struct device *d,
> > @@ -284,14 +281,11 @@ static ssize_t group_addr_store(struct device
> > *d,
> > {
> > struct net_bridge *br = to_bridge(d);
> > u8 new_addr[6];
> > - int i;
> >
> > if (!ns_capable(dev_net(br->dev)->user_ns, CAP_NET_ADMIN))
> > return -EPERM;
> >
> > - if (sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
> > - &new_addr[0], &new_addr[1], &new_addr[2],
> > - &new_addr[3], &new_addr[4], &new_addr[5]) != 6)
> > + if (!mac_pton(buf, new_addr))
> > return -EINVAL;
> >
> > if (!is_link_local_ether_addr(new_addr))
> > @@ -306,8 +300,7 @@ static ssize_t group_addr_store(struct device
> > *d,
> > return restart_syscall();
> >
> > spin_lock_bh(&br->lock);
> > - for (i = 0; i < 6; i++)
> > - br->group_addr[i] = new_addr[i];
> > + ether_addr_copy(br->group_addr, new_addr);
> > spin_unlock_bh(&br->lock);
> >
> > br->group_addr_set = true;
> >
>
>
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v1] bridge: Use helpers to handle MAC address
2017-12-19 18:10 [PATCH v1] bridge: Use helpers to handle MAC address Andy Shevchenko
2017-12-19 18:32 ` Stephen Hemminger
2017-12-19 19:21 ` Randy Dunlap
@ 2017-12-20 17:46 ` David Miller
2 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2017-12-20 17:46 UTC (permalink / raw)
To: andriy.shevchenko; +Cc: stephen, bridge, netdev
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date: Tue, 19 Dec 2017 20:10:53 +0200
> Use
> %pM to print MAC
> mac_pton() to convert it from ASCII to binary format, and
> ether_addr_copy() to copy.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applied to net-next
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-12-20 17:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-19 18:10 [PATCH v1] bridge: Use helpers to handle MAC address Andy Shevchenko
2017-12-19 18:32 ` Stephen Hemminger
2017-12-19 19:21 ` Randy Dunlap
2017-12-19 19:33 ` Andy Shevchenko
2017-12-20 17:46 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).