net/txgbe: update packet type

Update the packet type lookup table according to the HW design.
Fix the bug that inner L3 and L4 type can not be parsed when
QINQ insert in tunnel packet.

Fixes: 9e30b88f60b2 ("net/txgbe: support packet type")
Cc: stable@dpdk.org
Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>

diff --git a/drivers/net/txgbe/txgbe_ptypes.c b/drivers/net/txgbe/txgbe_ptypes.c
index cd160ebbaf8e9d05b3a1ba139df3a355ccac2e27..7009f208211a4fda641142f90aca71fea90cf315 100644 (file)
--- a/drivers/net/txgbe/txgbe_ptypes.c
+++ b/drivers/net/txgbe/txgbe_ptypes.c
@@ -50,6 +50,7 @@
 static u32 txgbe_ptype_lookup[TXGBE_PTID_MAX] __rte_cache_aligned = {
        /* L2:0-3 L3:4-7 L4:8-11 TUN:12-15 EL2:16-19 EL3:20-23 EL2:24-27 */
        /* L2: ETH */
+       TPTE(0x10, ETHER,          NONE, NONE, NONE, NONE, NONE, NONE),
        TPTE(0x11, ETHER,          NONE, NONE, NONE, NONE, NONE, NONE),
        TPTE(0x12, ETHER_TIMESYNC, NONE, NONE, NONE, NONE, NONE, NONE),
        TPTE(0x13, ETHER_FIP,      NONE, NONE, NONE, NONE, NONE, NONE),
@@ -67,6 +68,7 @@ static u32 txgbe_ptype_lookup[TXGBE_PTID_MAX] __rte_cache_aligned = {
        TPTE(0x1E, ETHER_FILTER,   NONE, NONE, NONE, NONE, NONE, NONE),
        TPTE(0x1F, ETHER_FILTER,   NONE, NONE, NONE, NONE, NONE, NONE),
        /* L3: IP */
+       TPTE(0x20, ETHER, IPV4, NONFRAG, NONE, NONE, NONE, NONE),
        TPTE(0x21, ETHER, IPV4, FRAG,    NONE, NONE, NONE, NONE),
        TPTE(0x22, ETHER, IPV4, NONFRAG, NONE, NONE, NONE, NONE),
        TPTE(0x23, ETHER, IPV4, UDP,     NONE, NONE, NONE, NONE),
@@ -339,7 +341,7 @@ txgbe_encode_ptype_tunnel(u32 ptype)
                break;
        case RTE_PTYPE_INNER_L2_ETHER_QINQ:
                ptid |= TXGBE_PTID_TUN_EIGMV;
-               return ptid;
+               break;
        default:
                break;
        }