net/sfc: fence off 8 bits in Rx mark for tunnel offload

[dpdk.git] / drivers / net / iavf / iavf_fdir.c

diff --git a/drivers/net/iavf/iavf_fdir.c b/drivers/net/iavf/iavf_fdir.c
index 560589a..b63aaca 100644 (file)
--- a/drivers/net/iavf/iavf_fdir.c
+++ b/drivers/net/iavf/iavf_fdir.c
@@ -431,7 +431,7 @@ iavf_fdir_parse_action_qregion(struct iavf_adapter *ad,
                }
        }
 
-       if (rss->queue[rss->queue_num - 1] >= ad->eth_dev->data->nb_rx_queues) {
+       if (rss->queue[rss->queue_num - 1] >= ad->dev_data->nb_rx_queues) {
                rte_flow_error_set(error, EINVAL,
                                RTE_FLOW_ERROR_TYPE_ACTION, act,
                                "Invalid queue region indexes.");
@@ -511,7 +511,7 @@ iavf_fdir_parse_action(struct iavf_adapter *ad,
                        filter_action->act_conf.queue.index = act_q->index;
 
                        if (filter_action->act_conf.queue.index >=
-                               ad->eth_dev->data->nb_rx_queues) {
+                               ad->dev_data->nb_rx_queues) {
                                rte_flow_error_set(error, EINVAL,
                                        RTE_FLOW_ERROR_TYPE_ACTION,
                                        actions, "Invalid queue for FDIR.");
@@ -1161,27 +1161,28 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
 
                        if (!gtp_psc_spec)
                                VIRTCHNL_SET_PROTO_HDR_TYPE(hdr, GTPU_EH);
-                       else if ((gtp_psc_mask->qfi) && !(gtp_psc_mask->pdu_type))
+                       else if ((gtp_psc_mask->hdr.qfi) &&
+                               !(gtp_psc_mask->hdr.type))
                                VIRTCHNL_SET_PROTO_HDR_TYPE(hdr, GTPU_EH);
-                       else if (gtp_psc_spec->pdu_type == IAVF_GTPU_EH_UPLINK)
+                       else if (gtp_psc_spec->hdr.type == IAVF_GTPU_EH_UPLINK)
                                VIRTCHNL_SET_PROTO_HDR_TYPE(hdr, GTPU_EH_PDU_UP);
-                       else if (gtp_psc_spec->pdu_type == IAVF_GTPU_EH_DWLINK)
+                       else if (gtp_psc_spec->hdr.type == IAVF_GTPU_EH_DWLINK)
                                VIRTCHNL_SET_PROTO_HDR_TYPE(hdr, GTPU_EH_PDU_DWN);
 
                        if (gtp_psc_spec && gtp_psc_mask) {
-                               if (gtp_psc_mask->qfi == UINT8_MAX) {
+                               if (gtp_psc_mask->hdr.qfi == 0x3F) {
                                        input_set |= IAVF_INSET_GTPU_QFI;
-                                       if (gtp_psc_spec->pdu_type ==
+                                       if (!gtp_psc_mask->hdr.type)
+                                               VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr,
+                                                                                GTPU_EH, QFI);
+                                       else if (gtp_psc_spec->hdr.type ==
                                                                IAVF_GTPU_EH_UPLINK)
                                                VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr,
                                                                                 GTPU_UP, QFI);
-                                       else if (gtp_psc_spec->pdu_type ==
+                                       else if (gtp_psc_spec->hdr.type ==
                                                                IAVF_GTPU_EH_DWLINK)
                                                VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr,
                                                                                 GTPU_DWN, QFI);
-                                       else
-                                               VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr,
-                                                                                GTPU_EH, QFI);
                                }
 
                                rte_memcpy(hdr->buffer, gtp_psc_spec,