Commit 79165121 authored by Michael Ellerman's avatar Michael Ellerman Committed by David S. Miller

[NET]: Add is_multicast_ether_addr() in include/linux/etherdevice.h

This patch adds is_multicast_ether_addr() to go along with
is_valid_ether_addr() and friends. It then changes
is_valid_ether_addr() to use the new macro, and fixes up the comment
on that function to move implementation details out of the API doco.
Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8f937c60
...@@ -55,19 +55,33 @@ static inline int is_zero_ether_addr(const u8 *addr) ...@@ -55,19 +55,33 @@ static inline int is_zero_ether_addr(const u8 *addr)
return !(addr[0] | addr[1] | addr[2] | addr[3] | addr[4] | addr[5]); return !(addr[0] | addr[1] | addr[2] | addr[3] | addr[4] | addr[5]);
} }
/**
* is_multicast_ether_addr - Determine if the given Ethernet address is a
* multicast address.
*
* @addr: Pointer to a six-byte array containing the Ethernet address
*
* Return true if the address is a multicast address.
*/
static inline int is_multicast_ether_addr(const u8 *addr)
{
return addr[0] & 0x01;
}
/** /**
* is_valid_ether_addr - Determine if the given Ethernet address is valid * is_valid_ether_addr - Determine if the given Ethernet address is valid
* @addr: Pointer to a six-byte array containing the Ethernet address * @addr: Pointer to a six-byte array containing the Ethernet address
* *
* Check that the Ethernet address (MAC) is not 00:00:00:00:00:00, is not * Check that the Ethernet address (MAC) is not 00:00:00:00:00:00, is not
* a multicast address, and is not FF:FF:FF:FF:FF:FF. The multicast * a multicast address, and is not FF:FF:FF:FF:FF:FF.
* and FF:FF:... tests are combined into the single test "!(addr[0]&1)".
* *
* Return true if the address is valid. * Return true if the address is valid.
*/ */
static inline int is_valid_ether_addr(const u8 *addr) static inline int is_valid_ether_addr(const u8 *addr)
{ {
return !(addr[0]&1) && !is_zero_ether_addr(addr); /* FF:FF:FF:FF:FF:FF is a multicast address so we don't need to
* explicitly check for it here. */
return !is_multicast_ether_addr(addr) && !is_zero_ether_addr(addr);
} }
/** /**
...@@ -83,6 +97,6 @@ static inline void random_ether_addr(u8 *addr) ...@@ -83,6 +97,6 @@ static inline void random_ether_addr(u8 *addr)
addr [0] &= 0xfe; /* clear multicast bit */ addr [0] &= 0xfe; /* clear multicast bit */
addr [0] |= 0x02; /* set local assignment bit (IEEE802) */ addr [0] |= 0x02; /* set local assignment bit (IEEE802) */
} }
#endif #endif /* __KERNEL__ */
#endif /* _LINUX_ETHERDEVICE_H */ #endif /* _LINUX_ETHERDEVICE_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment