tc: fix compile problem in debug and old dpdk versions reported by ci

jickding · Mar 19, 2021 · a7eac97 · a7eac97
1 parent f1645e5
commit a7eac97
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/netif.c b/src/netif.c
@@ -2259,7 +2259,7 @@ static int netif_deliver_mbuf(struct netif_port *dev, lcoreid_t cid,
      */
     if (dev->flag & NETIF_PORT_FLAG_FORWARD2KNI) {
         struct rte_mbuf *mbuf_copied = mbuf_copy(mbuf, pktmbuf_pool[dev->socket]);
-        if (likely(mbuf_copied))
+        if (likely(mbuf_copied != NULL))
             kni_ingress(mbuf_copied, dev);
         else
             RTE_LOG(WARNING, NETIF, "%s: failed to copy mbuf for kni\n", __func__);

diff --git a/src/tc/cls_match.c b/src/tc/cls_match.c
@@ -204,8 +204,8 @@ static int match_classify(struct tc_cls *cls, struct rte_mbuf *mbuf,
         char cls_id[16], qsch_id[16];
 
         if (ip6h) {
-            inet_ntop(AF_INET6, &ip6h->saddr, sip, sizeof(sip));
-            inet_ntop(AF_INET6, &ip6h->daddr, dip, sizeof(dip));
+            inet_ntop(AF_INET6, &ip6h->ip6_src, sip, sizeof(sip));
+            inet_ntop(AF_INET6, &ip6h->ip6_dst, dip, sizeof(dip));
         } else {
             inet_ntop(AF_INET, &iph->saddr, sip, sizeof(sip));
             inet_ntop(AF_INET, &iph->daddr, dip, sizeof(dip));