* [PATCH net-next 1/3] bridge: Use is_link_local() in store_group_addr()
@ 2012-11-01 19:10 Ben Hutchings
2012-11-03 1:34 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Ben Hutchings @ 2012-11-01 19:10 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Stephen Hemminger
Parse the string into an array of bytes rather than ints, so we can
use is_link_local() rather than reimplementing it.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
---
net/bridge/br_sysfs_br.c | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index e157b0d..82385fd 100644
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -298,23 +298,18 @@ static ssize_t store_group_addr(struct device *d,
const char *buf, size_t len)
{
struct net_bridge *br = to_bridge(d);
- unsigned int new_addr[6];
+ u8 new_addr[6];
int i;
if (!capable(CAP_NET_ADMIN))
return -EPERM;
- if (sscanf(buf, "%x:%x:%x:%x:%x:%x",
+ 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)
return -EINVAL;
- /* Must be 01:80:c2:00:00:0X */
- for (i = 0; i < 5; i++)
- if (new_addr[i] != br_reserved_address[i])
- return -EINVAL;
-
- if (new_addr[5] & ~0xf)
+ if (!is_link_local(new_addr))
return -EINVAL;
if (new_addr[5] == 1 || /* 802.3x Pause address */
--
1.7.7.6
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next 1/3] bridge: Use is_link_local() in store_group_addr()
2012-11-01 19:10 [PATCH net-next 1/3] bridge: Use is_link_local() in store_group_addr() Ben Hutchings
@ 2012-11-03 1:34 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2012-11-03 1:34 UTC (permalink / raw)
To: bhutchings; +Cc: netdev, shemminger
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Thu, 1 Nov 2012 19:10:04 +0000
> Parse the string into an array of bytes rather than ints, so we can
> use is_link_local() rather than reimplementing it.
>
> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-11-03 1:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-01 19:10 [PATCH net-next 1/3] bridge: Use is_link_local() in store_group_addr() Ben Hutchings
2012-11-03 1:34 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.