From 632ea8bf9f9a47b723ea6e537f509ed7c850c773 Mon Sep 17 00:00:00 2001 From: ywc689 Date: Tue, 13 Apr 2021 11:49:29 +0800 Subject: [PATCH] tc: remove duplicated functions --- include/linux_ipv6.h | 12 ------------ src/tc/cls_match.c | 8 ++++---- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/include/linux_ipv6.h b/include/linux_ipv6.h index c25baa319..05bc4ae3b 100644 --- a/include/linux_ipv6.h +++ b/include/linux_ipv6.h @@ -266,18 +266,6 @@ static inline int ipv6_addr_cmp(const struct in6_addr *a1, const struct in6_addr return memcmp(a1, a2, sizeof(struct in6_addr)); } -static inline int ipv6_addr_cmp_u128(const struct in6_addr *a1, const struct in6_addr *a2) -{ - uint8_t *p1, *p2; - - for (p1 = (uint8_t *)a1, p2 = (uint8_t *)a2; p1 - (uint8_t *)a1 < 16; p1++, p2++) { - if (*p1 != *p2) - return *p1 > *p2 ? 1 : -1; - } - - return 0; -} - static inline bool ipv6_masked_addr_cmp(const struct in6_addr *a1, const struct in6_addr *m, const struct in6_addr *a2) diff --git a/src/tc/cls_match.c b/src/tc/cls_match.c index ebbdbbae8..0a2772769 100644 --- a/src/tc/cls_match.c +++ b/src/tc/cls_match.c @@ -119,14 +119,14 @@ static int match_classify(struct tc_cls *cls, struct rte_mbuf *mbuf, ip6h = rte_pktmbuf_mtod_offset(mbuf, struct ip6_hdr *, offset); if (!ipv6_addr_any(&m->srange.max_addr.in6)) { - if (ipv6_addr_cmp_u128(&ip6h->ip6_src, &m->srange.min_addr.in6) < 0 || - ipv6_addr_cmp_u128(&ip6h->ip6_src, &m->srange.max_addr.in6) > 0) + if (ipv6_addr_cmp(&ip6h->ip6_src, &m->srange.min_addr.in6) < 0 || + ipv6_addr_cmp(&ip6h->ip6_src, &m->srange.max_addr.in6) > 0) goto done; } if (!ipv6_addr_any(&m->drange.max_addr.in6)) { - if (ipv6_addr_cmp_u128(&ip6h->ip6_dst, &m->drange.min_addr.in6) < 0 || - ipv6_addr_cmp_u128(&ip6h->ip6_dst, &m->drange.max_addr.in6) > 0) + if (ipv6_addr_cmp(&ip6h->ip6_dst, &m->drange.min_addr.in6) < 0 || + ipv6_addr_cmp(&ip6h->ip6_dst, &m->drange.max_addr.in6) > 0) goto done; }