aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
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 /drivers
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 'drivers')
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c2
-rw-r--r--drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c2
-rw-r--r--drivers/net/ethernet/intel/ixgbevf/vf.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index b54bc40f00b0..690535a0322f 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -6953,7 +6953,7 @@ static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
6953 return -EINVAL; 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 u32 rar_uc_entries = IXGBE_MAX_PF_MACVLANS; 6957 u32 rar_uc_entries = IXGBE_MAX_PF_MACVLANS;
6958 6958
6959 if (netdev_uc_count(dev) < rar_uc_entries) 6959 if (netdev_uc_count(dev) < rar_uc_entries)
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index c281ee9c9e2a..f3d3947ae962 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -2979,7 +2979,7 @@ static int ixgbevf_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
2979 unsigned short f; 2979 unsigned short f;
2980#endif 2980#endif
2981 u8 *dst_mac = skb_header_pointer(skb, 0, 0, NULL); 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 dev_kfree_skb(skb); 2983 dev_kfree_skb(skb);
2984 return NETDEV_TX_OK; 2984 return NETDEV_TX_OK;
2985 } 2985 }
diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c
index c0fd1ef49400..0c94557b53df 100644
--- a/drivers/net/ethernet/intel/ixgbevf/vf.c
+++ b/drivers/net/ethernet/intel/ixgbevf/vf.c
@@ -331,7 +331,7 @@ static s32 ixgbevf_update_mc_addr_list_vf(struct ixgbe_hw *hw,
331 netdev_for_each_mc_addr(ha, netdev) { 331 netdev_for_each_mc_addr(ha, netdev) {
332 if (i == cnt) 332 if (i == cnt)
333 break; 333 break;
334 if (is_link_local(ha->addr)) 334 if (is_link_local_ether_addr(ha->addr))
335 continue; 335 continue;
336 336
337 vector_list[i++] = ixgbevf_mta_vector(hw, ha->addr); 337 vector_list[i++] = ixgbevf_mta_vector(hw, ha->addr);