net/bnxt: fix RSS action parser

[dpdk.git] / drivers / net / bnxt / bnxt_flow.c

diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c
index b2ebb56..09b1342 100644 (file)
--- a/drivers/net/bnxt/bnxt_flow.c
+++ b/drivers/net/bnxt/bnxt_flow.c
@@ -978,7 +978,7 @@ static int bnxt_vnic_prep(struct bnxt *bp, struct bnxt_vnic_info *vnic,
                }
        }
 
-       if (rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP)
+       if (rx_offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)
                vnic->vlan_strip = true;
        else
                vnic->vlan_strip = false;
@@ -1084,10 +1084,6 @@ bnxt_validate_rss_action(const struct rte_flow_action actions[])
                        break;
                case RTE_FLOW_ACTION_TYPE_RSS:
                        break;
-               case RTE_FLOW_ACTION_TYPE_MARK:
-                       break;
-               case RTE_FLOW_ACTION_TYPE_COUNT:
-                       break;
                default:
                        return -ENOTSUP;
                }
@@ -1151,11 +1147,10 @@ bnxt_vnic_rss_cfg_update(struct bnxt *bp,
        }
 
        /* Currently RSS hash on inner and outer headers are supported.
-        * 0 => Default setting
-        * 1 => Inner
-        * 2 => Outer
+        * 0 => Default (innermost RSS) setting
+        * 1 => Outermost
         */
-       if (rss->level > 2) {
+       if (rss->level > 1) {
                rte_flow_error_set(error,
                                   ENOTSUP,
                                   RTE_FLOW_ERROR_TYPE_ACTION,
@@ -1177,7 +1172,7 @@ bnxt_vnic_rss_cfg_update(struct bnxt *bp,
        }
 
        /* If RSS types is 0, use a best effort configuration */
-       types = rss->types ? rss->types : ETH_RSS_IPV4;
+       types = rss->types ? rss->types : RTE_ETH_RSS_IPV4 | RTE_ETH_RSS_IPV6;
 
        hash_type = bnxt_rte_to_hwrm_hash_types(types);
 
@@ -1322,7 +1317,7 @@ start:
 
                rxq = bp->rx_queues[act_q->index];
 
-               if (!(dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS) && rxq &&
+               if (!(dev_conf->rxmode.mq_mode & RTE_ETH_MQ_RX_RSS) && rxq &&
                    vnic->fw_vnic_id != INVALID_HW_RING_ID)
                        goto use_vnic;