[dpdk-dev] [PATCH 4/5] net/i40e: change list of parameters for functions mapping flow type to pctype and back

[Kirill Rybalchenko]

Functions i40e_pctype_to_flowtype and i40e_flowtype_to_pctype are
changed to work with dynamic mapping pctype to flowtype table.
This table is located in private data area of adapter structure.
Therefore those functions need one extra parameter pointing to
the adapter data structure.

Signed-off-by: Kirill Rybalchenko <kirill.rybalche...@intel.com>
---
 drivers/net/i40e/i40e_fdir.c | 10 +++++-----
 drivers/net/i40e/i40e_flow.c |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index 8013add..7515941 100644
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -665,10 +665,10 @@ i40e_fdir_configure(struct rte_eth_dev *dev)
                        pctype = (enum i40e_filter_pctype)i40e_read_rx_ctl(
                                hw, I40E_GLQF_FD_PCTYPES(
                                (int)i40e_flowtype_to_pctype(
-                               conf->flex_mask[i].flow_type)));
+                               conf->flex_mask[i].flow_type, pf->adapter)));
                } else
                        pctype = i40e_flowtype_to_pctype(
-                               conf->flex_mask[i].flow_type);
+                               conf->flex_mask[i].flow_type, pf->adapter);
 
                i40e_set_flex_mask_on_pctype(pf, pctype, &conf->flex_mask[i]);
        }
@@ -1143,9 +1143,9 @@ i40e_add_del_fdir_filter(struct rte_eth_dev *dev,
                pctype = (enum i40e_filter_pctype)i40e_read_rx_ctl(
                        hw, I40E_GLQF_FD_PCTYPES(
                        (int)i40e_flowtype_to_pctype(
-                       filter->input.flow_type)));
+                       filter->input.flow_type, pf->adapter)));
        } else
-               pctype = i40e_flowtype_to_pctype(filter->input.flow_type);
+               pctype = i40e_flowtype_to_pctype(filter->input.flow_type, 
pf->adapter);
 
        ret = i40e_fdir_filter_programming(pf, pctype, filter, add);
        if (ret < 0) {
@@ -1400,7 +1400,7 @@ i40e_fdir_info_get_flex_mask(struct i40e_pf *pf,
                        if (!I40E_VALID_PCTYPE((enum i40e_filter_pctype)i))
                                continue;
                }
-               flow_type = i40e_pctype_to_flowtype((enum i40e_filter_pctype)i);
+               flow_type = i40e_pctype_to_flowtype(i, pf->adapter);
                for (j = 0; j < I40E_FDIR_MAX_FLEXWORD_NUM; j++) {
                        if (mask->word_mask & I40E_FLEX_WORD_MASK(j)) {
                                ptr->mask[j * sizeof(uint16_t)] = UINT8_MAX;
diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index b92719a..4db771c 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -2776,7 +2776,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
                }
        }
 
-       pctype = i40e_flowtype_to_pctype(flow_type);
+       pctype = i40e_flowtype_to_pctype(flow_type, pf->adapter);
        if (pctype == 0 || pctype > I40E_FILTER_PCTYPE_L2_PAYLOAD) {
                rte_flow_error_set(error, EINVAL,
                                   RTE_FLOW_ERROR_TYPE_ITEM, item,
-- 
2.5.5