Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46acc460 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

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: default avatarBen Hutchings <bhutchings@solarflare.com>
Acked-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4197f24b

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+1 −1
Original line number Diff line number Diff line
@@ -6953,7 +6953,7 @@ static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 
		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;



		if (netdev_uc_count(dev) < rar_uc_entries)

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2979,7 +2979,7 @@ static int ixgbevf_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 
	unsigned short f;

#endif

	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);

		return NETDEV_TX_OK;

	}

drivers/net/ethernet/intel/ixgbevf/vf.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static s32 ixgbevf_update_mc_addr_list_vf(struct ixgbe_hw *hw, 
	netdev_for_each_mc_addr(ha, netdev) {

		if (i == cnt)

			break;

		if (is_link_local(ha->addr))

		if (is_link_local_ether_addr(ha->addr))

			continue;



		vector_list[i++] = ixgbevf_mta_vector(hw, ha->addr);

include/linux/etherdevice.h

+3 −3
Original line number Diff line number Diff line
@@ -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 };



/**

 * 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

 *

 * Return true if address is link local reserved addr (01:80:c2:00:00:0X) per

 * 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 m = cpu_to_be16(0xfff0);

net/bridge/br_input.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ rx_handler_result_t br_handle_frame(struct sk_buff **pskb) 


	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

		 *