Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 46acc460c07b5c74287560a00b6cbc6111136ab6

Authored by Ben Hutchings
Committed by David S. Miller
1 parent 4197f24b5b
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 6 changed files with 8 additions and 8 deletions Side-by-side Diff

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Diff comments   View file @ 46acc46
... ... @@ -6953,7 +6953,7 @@
6953 6953 return -EINVAL;
6954 6954 }
6955 6955  
6956   - if (is_unicast_ether_addr(addr) || is_link_local(addr)) {
  6956 + if (is_unicast_ether_addr(addr) || is_link_local_ether_addr(addr)) {
6957 6957 u32 rar_uc_entries = IXGBE_MAX_PF_MACVLANS;
6958 6958  
6959 6959 if (netdev_uc_count(dev) < rar_uc_entries)
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Diff comments   View file @ 46acc46
... ... @@ -2979,7 +2979,7 @@
2979 2979 unsigned short f;
2980 2980 #endif
2981 2981 u8 *dst_mac = skb_header_pointer(skb, 0, 0, NULL);
2982   - if (!dst_mac || is_link_local(dst_mac)) {
  2982 + if (!dst_mac || is_link_local_ether_addr(dst_mac)) {
2983 2983 dev_kfree_skb(skb);
2984 2984 return NETDEV_TX_OK;
2985 2985 }
drivers/net/ethernet/intel/ixgbevf/vf.c
Diff comments   View file @ 46acc46
... ... @@ -331,7 +331,7 @@
331 331 netdev_for_each_mc_addr(ha, netdev) {
332 332 if (i == cnt)
333 333 break;
334   - if (is_link_local(ha->addr))
  334 + if (is_link_local_ether_addr(ha->addr))
335 335 continue;
336 336  
337 337 vector_list[i++] = ixgbevf_mta_vector(hw, ha->addr);
include/linux/etherdevice.h
Diff comments   View file @ 46acc46
... ... @@ -55,15 +55,15 @@
55 55 static const u8 br_reserved_address[ETH_ALEN] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
56 56  
57 57 /**
58   - * is_link_local - Determine if given Eth addr is a link local mcast address.
  58 + * is_link_local_ether_addr - Determine if given Ethernet address is link-local
59 59 * @addr: Pointer to a six-byte array containing the Ethernet address
60 60 *
61 61 * Return true if address is link local reserved addr (01:80:c2:00:00:0X) per
62 62 * IEEE 802.1Q 8.6.3 Frame filtering.
63 63 */
64   -static inline int is_link_local(const unsigned char *dest)
  64 +static inline bool is_link_local_ether_addr(const u8 *addr)
65 65 {
66   - __be16 *a = (__be16 *)dest;
  66 + __be16 *a = (__be16 *)addr;
67 67 static const __be16 *b = (const __be16 *)br_reserved_address;
68 68 static const __be16 m = cpu_to_be16(0xfff0);
69 69  
net/bridge/br_input.c
Diff comments   View file @ 46acc46
... ... @@ -147,7 +147,7 @@
147 147  
148 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 152 * See IEEE 802.1D Table 7-10 Reserved addresses
153 153 *
net/bridge/br_sysfs_br.c
Diff comments   View file @ 46acc46
... ... @@ -309,7 +309,7 @@
309 309 &new_addr[3], &new_addr[4], &new_addr[5]) != 6)
310 310 return -EINVAL;
311 311  
312   - if (!is_link_local(new_addr))
  312 + if (!is_link_local_ether_addr(new_addr))
313 313 return -EINVAL;
314 314  
315 315 if (new_addr[5] == 1 || /* 802.3x Pause address */