aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2012-11-01 05:11:11 -0400
committerDavid S. Miller <davem@davemloft.net>2012-11-02 21:34:05 -0400
commit46acc460c07b5c74287560a00b6cbc6111136ab6 (patch)
treec6fea173bd0ec28ba4eb5790cd2601a60bcbcc3e /net/bridge
parent4197f24b5bd8be03e84d23920e90f6a1313f4b79 (diff)
eth: Make is_link_local() consistent with other address tests
Function name should include '_ether_addr'. Return type should be bool. Parameter name should be 'addr' not 'dest' (also matching kernel-doc). Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Acked-by: John Fastabend <john.r.fastabend@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_input.c2
-rw-r--r--net/bridge/br_sysfs_br.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index d047978bf025..4b34207419b1 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -147,7 +147,7 @@ rx_handler_result_t br_handle_frame(struct sk_buff **pskb)
147 147
148 p = br_port_get_rcu(skb->dev); 148 p = br_port_get_rcu(skb->dev);
149 149
150 if (unlikely(is_link_local(dest))) { 150 if (unlikely(is_link_local_ether_addr(dest))) {
151 /* 151 /*
152 * See IEEE 802.1D Table 7-10 Reserved addresses 152 * See IEEE 802.1D Table 7-10 Reserved addresses
153 * 153 *
diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index 82385fd2f187..cffb76e2161c 100644
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -309,7 +309,7 @@ static ssize_t store_group_addr(struct device *d,
309 &new_addr[3], &new_addr[4], &new_addr[5]) != 6) 309 &new_addr[3], &new_addr[4], &new_addr[5]) != 6)
310 return -EINVAL; 310 return -EINVAL;
311 311
312 if (!is_link_local(new_addr)) 312 if (!is_link_local_ether_addr(new_addr))
313 return -EINVAL; 313 return -EINVAL;
314 314
315 if (new_addr[5] == 1 || /* 802.3x Pause address */ 315 if (new_addr[5] == 1 || /* 802.3x Pause address */