X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fethernet%2Fethernet.h;h=cc44c4e2cf0fbbbc558f292d4e42c2b65d70a237;hb=ecdfb2cbee547a113d3700da07c8920924bfb62d;hp=0bfd48723e2f6ef4d0a29b425d0b04c27940a098;hpb=571ab20d1da227fb66d52ed52cce0cbd4591e1c9;p=vpp.git diff --git a/src/vnet/ethernet/ethernet.h b/src/vnet/ethernet/ethernet.h index 0bfd48723e2..cc44c4e2cf0 100644 --- a/src/vnet/ethernet/ethernet.h +++ b/src/vnet/ethernet/ethernet.h @@ -46,7 +46,7 @@ #include always_inline u64 -ethernet_mac_address_u64 (u8 * a) +ethernet_mac_address_u64 (const u8 * a) { return (((u64) a[0] << (u64) (5 * 8)) | ((u64) a[1] << (u64) (4 * 8)) @@ -55,6 +55,18 @@ ethernet_mac_address_u64 (u8 * a) | ((u64) a[4] << (u64) (1 * 8)) | ((u64) a[5] << (u64) (0 * 8))); } +always_inline void +ethernet_mac_address_from_u64 (u64 u, u8 * a) +{ + i8 ii; + + for (ii = 5; ii >= 0; ii--) + { + a[ii] = u & 0xFF; + u = u >> 8; + } +} + static inline int ethernet_mac_address_is_multicast_u64 (u64 a) { @@ -62,7 +74,7 @@ ethernet_mac_address_is_multicast_u64 (u64 a) } static inline int -ethernet_mac_address_is_zero (u8 * mac) +ethernet_mac_address_is_zero (const u8 * mac) { return ((*((u32 *) mac) == 0) && (*((u16 *) (mac + 4)) == 0)); } @@ -541,7 +553,7 @@ matched: // Compare two ethernet macs. Return 1 if they are the same, 0 if different always_inline u32 -eth_mac_equal (u8 * mac1, u8 * mac2) +eth_mac_equal (const u8 * mac1, const u8 * mac2) { return (*((u32 *) (mac1 + 0)) == *((u32 *) (mac2 + 0)) && *((u32 *) (mac1 + 2)) == *((u32 *) (mac2 + 2)));