Formatting ethernet address and getting a random value are
not in critical path so they should not be inlined.
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
lib/librte_net/Makefile | 1 +
lib/librte_net/rte_ether.c | 29 +++++++++++++++++++++++++++++
lib/librte_net/rte_ether.h | 24 ++++--------------------
lib/librte_net/rte_net_version.map | 8 ++++++++
4 files changed, 42 insertions(+), 20 deletions(-)
create mode 100644 lib/librte_net/rte_ether.c
diff --git a/lib/librte_net/Makefile b/lib/librte_net/Makefile
index c3082069ab50..b4900b44f4d0 100644
--- a/lib/librte_net/Makefile
+++ b/lib/librte_net/Makefile
@@ -15,6 +15,7 @@ LIBABIVER := 1
SRCS-$(CONFIG_RTE_LIBRTE_NET) := rte_net.c
SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_net_crc.c
SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_arp.c
+SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_ether.c
# install includes
SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include := rte_ip.h rte_tcp.h rte_udp.h
rte_esp.h
diff --git a/lib/librte_net/rte_ether.c b/lib/librte_net/rte_ether.c
new file mode 100644
index 000000000000..d4b41f122a16
--- /dev/null
+++ b/lib/librte_net/rte_ether.c
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+
+#include <rte_ether.h>
+
+void
+eth_random_addr(uint8_t *addr)
+{
+ uint64_t rand = rte_rand();
+ uint8_t *p = (uint8_t *)&rand;
+
+ rte_memcpy(addr, p, ETHER_ADDR_LEN);
+ addr[0] &= (uint8_t)~ETHER_GROUP_ADDR; /* clear multicast bit */
+ addr[0] |= ETHER_LOCAL_ADMIN_ADDR; /* set local assignment bit */
+}
+
+void
+ether_format_addr(char *buf, uint16_t size,
+ const struct ether_addr *eth_addr)
+{
+ snprintf(buf, size, "%02X:%02X:%02X:%02X:%02X:%02X",
+ eth_addr->addr_bytes[0],
+ eth_addr->addr_bytes[1],
+ eth_addr->addr_bytes[2],
+ eth_addr->addr_bytes[3],
+ eth_addr->addr_bytes[4],
+ eth_addr->addr_bytes[5]);
+}
diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h
index 0954d183cca7..ed178a1f1736 100644
--- a/lib/librte_net/rte_ether.h
+++ b/lib/librte_net/rte_ether.h
@@ -205,15 +205,8 @@ static inline int is_valid_assigned_ether_addr(const
struct ether_addr *ea)
* @param addr
* A pointer to Ethernet address.
*/
-static inline void eth_random_addr(uint8_t *addr)
-{
- uint64_t rand = rte_rand();
- uint8_t *p = (uint8_t *)&rand;
-
- rte_memcpy(addr, p, ETHER_ADDR_LEN);
- addr[0] &= (uint8_t)~ETHER_GROUP_ADDR; /* clear multicast bit */
- addr[0] |= ETHER_LOCAL_ADMIN_ADDR; /* set local assignment bit */
-}
+void
+eth_random_addr(uint8_t *addr);
/**
* Fast copy an Ethernet address.
@@ -252,18 +245,9 @@ static inline void ether_addr_copy(const struct ether_addr
*ea_from,
* @param eth_addr
* A pointer to a ether_addr structure.
*/
-static inline void
+void
ether_format_addr(char *buf, uint16_t size,
- const struct ether_addr *eth_addr)
-{
- snprintf(buf, size, "%02X:%02X:%02X:%02X:%02X:%02X",
- eth_addr->addr_bytes[0],
- eth_addr->addr_bytes[1],
- eth_addr->addr_bytes[2],
- eth_addr->addr_bytes[3],
- eth_addr->addr_bytes[4],
- eth_addr->addr_bytes[5]);
-}
+ const struct ether_addr *eth_addr);
/**
* Ethernet header: Contains the destination address, source address
diff --git a/lib/librte_net/rte_net_version.map
b/lib/librte_net/rte_net_version.map
index 26c06e7c7ae7..49d34093781c 100644
--- a/lib/librte_net/rte_net_version.map
+++ b/lib/librte_net/rte_net_version.map
@@ -13,6 +13,14 @@ DPDK_17.05 {
} DPDK_16.11;
+DPDK_19.08 {
+ global:
+
+ eth_random_addr;
+ eth_format_addr;
+} DPDK_17.05;
+
+
EXPERIMENTAL {
global:
--
2.20.1
