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>
This commit is contained in:
parent
4197f24b5b
commit
46acc460c0
|
@ -6953,7 +6953,7 @@ static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_unicast_ether_addr(addr) || is_link_local(addr)) {
|
if (is_unicast_ether_addr(addr) || is_link_local_ether_addr(addr)) {
|
||||||
u32 rar_uc_entries = IXGBE_MAX_PF_MACVLANS;
|
u32 rar_uc_entries = IXGBE_MAX_PF_MACVLANS;
|
||||||
|
|
||||||
if (netdev_uc_count(dev) < rar_uc_entries)
|
if (netdev_uc_count(dev) < rar_uc_entries)
|
||||||
|
|
|
@ -2979,7 +2979,7 @@ static int ixgbevf_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
|
||||||
unsigned short f;
|
unsigned short f;
|
||||||
#endif
|
#endif
|
||||||
u8 *dst_mac = skb_header_pointer(skb, 0, 0, NULL);
|
u8 *dst_mac = skb_header_pointer(skb, 0, 0, NULL);
|
||||||
if (!dst_mac || is_link_local(dst_mac)) {
|
if (!dst_mac || is_link_local_ether_addr(dst_mac)) {
|
||||||
dev_kfree_skb(skb);
|
dev_kfree_skb(skb);
|
||||||
return NETDEV_TX_OK;
|
return NETDEV_TX_OK;
|
||||||
}
|
}
|
||||||
|
|
|
@ -331,7 +331,7 @@ static s32 ixgbevf_update_mc_addr_list_vf(struct ixgbe_hw *hw,
|
||||||
netdev_for_each_mc_addr(ha, netdev) {
|
netdev_for_each_mc_addr(ha, netdev) {
|
||||||
if (i == cnt)
|
if (i == cnt)
|
||||||
break;
|
break;
|
||||||
if (is_link_local(ha->addr))
|
if (is_link_local_ether_addr(ha->addr))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
vector_list[i++] = ixgbevf_mta_vector(hw, ha->addr);
|
vector_list[i++] = ixgbevf_mta_vector(hw, ha->addr);
|
||||||
|
|
|
@ -55,15 +55,15 @@ extern struct net_device *alloc_etherdev_mqs(int sizeof_priv, unsigned int txqs,
|
||||||
static const u8 br_reserved_address[ETH_ALEN] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
|
static const u8 br_reserved_address[ETH_ALEN] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* is_link_local - Determine if given Eth addr is a link local mcast address.
|
* is_link_local_ether_addr - Determine if given Ethernet address is link-local
|
||||||
* @addr: Pointer to a six-byte array containing the Ethernet address
|
* @addr: Pointer to a six-byte array containing the Ethernet address
|
||||||
*
|
*
|
||||||
* Return true if address is link local reserved addr (01:80:c2:00:00:0X) per
|
* Return true if address is link local reserved addr (01:80:c2:00:00:0X) per
|
||||||
* IEEE 802.1Q 8.6.3 Frame filtering.
|
* IEEE 802.1Q 8.6.3 Frame filtering.
|
||||||
*/
|
*/
|
||||||
static inline int is_link_local(const unsigned char *dest)
|
static inline bool is_link_local_ether_addr(const u8 *addr)
|
||||||
{
|
{
|
||||||
__be16 *a = (__be16 *)dest;
|
__be16 *a = (__be16 *)addr;
|
||||||
static const __be16 *b = (const __be16 *)br_reserved_address;
|
static const __be16 *b = (const __be16 *)br_reserved_address;
|
||||||
static const __be16 m = cpu_to_be16(0xfff0);
|
static const __be16 m = cpu_to_be16(0xfff0);
|
||||||
|
|
||||||
|
|
|
@ -147,7 +147,7 @@ rx_handler_result_t br_handle_frame(struct sk_buff **pskb)
|
||||||
|
|
||||||
p = br_port_get_rcu(skb->dev);
|
p = br_port_get_rcu(skb->dev);
|
||||||
|
|
||||||
if (unlikely(is_link_local(dest))) {
|
if (unlikely(is_link_local_ether_addr(dest))) {
|
||||||
/*
|
/*
|
||||||
* See IEEE 802.1D Table 7-10 Reserved addresses
|
* See IEEE 802.1D Table 7-10 Reserved addresses
|
||||||
*
|
*
|
||||||
|
|
|
@ -309,7 +309,7 @@ static ssize_t store_group_addr(struct device *d,
|
||||||
&new_addr[3], &new_addr[4], &new_addr[5]) != 6)
|
&new_addr[3], &new_addr[4], &new_addr[5]) != 6)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
if (!is_link_local(new_addr))
|
if (!is_link_local_ether_addr(new_addr))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
if (new_addr[5] == 1 || /* 802.3x Pause address */
|
if (new_addr[5] == 1 || /* 802.3x Pause address */
|
||||||
|
|
Reference in New Issue