net/mlx5: fix packet length assert in MPRQ

[dpdk.git] / drivers / net / octeontx2 / otx2_rss.c

diff --git a/drivers/net/octeontx2/otx2_rss.c b/drivers/net/octeontx2/otx2_rss.c
index 7a8c8f3..5e3f866 100644 (file)
--- a/drivers/net/octeontx2/otx2_rss.c
+++ b/drivers/net/octeontx2/otx2_rss.c
@@ -210,6 +210,11 @@ otx2_rss_ethdev_to_nix(struct otx2_eth_dev *dev, uint64_t ethdev_rss,
 
        dev->rss_info.nix_rss = ethdev_rss;
 
+       if (ethdev_rss & ETH_RSS_L2_PAYLOAD &&
+           dev->npc_flow.switch_header_type == OTX2_PRIV_FLAGS_LEN_90B) {
+               flowkey_cfg |= FLOW_KEY_TYPE_CH_LEN_90B;
+       }
+
        if (ethdev_rss & ETH_RSS_L3_SRC_ONLY)
                flowkey_cfg |= FLOW_KEY_TYPE_L3_SRC;
 
@@ -353,7 +358,7 @@ otx2_nix_rss_config(struct rte_eth_dev *eth_dev)
        int rc;
 
        /* Skip further configuration if selected mode is not RSS */
-       if (eth_dev->data->dev_conf.rxmode.mq_mode != ETH_MQ_RX_RSS)
+       if (eth_dev->data->dev_conf.rxmode.mq_mode != ETH_MQ_RX_RSS || !qcnt)
                return 0;
 
        /* Update default RSS key and cfg */