ice: Remove unused struct ice_prot_lkup_ext members

Remove field_off as it's never used.

Remove done bitmap, as its value is only checked and never assigned.
Reusing sub-recipes while creating new root recipes is currently not
supported in the driver.

Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: Marcin Szycik <marcin.szycik@linux.intel.com>
Tested-by: Sujai Buvaneswaran <sujai.buvaneswaran@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_protocol_type.h b/drivers/net/ethernet/intel/ice/ice_protocol_type.h
index 755a9c55267cbcf1868edc3deefda0b9a4a5fe60..c396dabacef460705e6ac6e3daeaa031ca7cae09 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_protocol_type.h
+++ b/drivers/net/ethernet/intel/ice/ice_protocol_type.h
@@ -452,13 +452,9 @@ struct ice_prot_lkup_ext {
        u16 prot_type;
        u8 n_val_words;
        /* create a buffer to hold max words per recipe */
-       u16 field_off[ICE_MAX_CHAIN_WORDS];
        u16 field_mask[ICE_MAX_CHAIN_WORDS];
 
        struct ice_fv_word fv_words[ICE_MAX_CHAIN_WORDS];
-
-       /* Indicate field offsets that have field vector indices assigned */
-       DECLARE_BITMAP(done, ICE_MAX_CHAIN_WORDS);
 };
 
 struct ice_pref_recipe_group {

diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c
index 1191031b2a43d15d5cded3c16cfaa8d4baf63220..0d58cf1856988cfa54771b06119d62cc23fc3e26 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_switch.c
+++ b/drivers/net/ethernet/intel/ice/ice_switch.c
@@ -4918,33 +4918,27 @@ ice_create_first_fit_recp_def(struct ice_hw *hw,
 
        *recp_cnt = 0;
 
-       /* Walk through every word in the rule to check if it is not done. If so
-        * then this word needs to be part of a new recipe.
-        */
-       for (j = 0; j < lkup_exts->n_val_words; j++)
-               if (!test_bit(j, lkup_exts->done)) {
-                       if (!grp ||
-                           grp->n_val_pairs == ICE_NUM_WORDS_RECIPE) {
-                               struct ice_recp_grp_entry *entry;
-
-                               entry = devm_kzalloc(ice_hw_to_dev(hw),
-                                                    sizeof(*entry),
-                                                    GFP_KERNEL);
-                               if (!entry)
-                                       return -ENOMEM;
-                               list_add(&entry->l_entry, rg_list);
-                               grp = &entry->r_group;
-                               (*recp_cnt)++;
-                       }
-
-                       grp->pairs[grp->n_val_pairs].prot_id =
-                               lkup_exts->fv_words[j].prot_id;
-                       grp->pairs[grp->n_val_pairs].off =
-                               lkup_exts->fv_words[j].off;
-                       grp->mask[grp->n_val_pairs] = lkup_exts->field_mask[j];
-                       grp->n_val_pairs++;
+       for (j = 0; j < lkup_exts->n_val_words; j++) {
+               if (!grp || grp->n_val_pairs == ICE_NUM_WORDS_RECIPE) {
+                       struct ice_recp_grp_entry *entry;
+
+                       entry = devm_kzalloc(ice_hw_to_dev(hw), sizeof(*entry),
+                                            GFP_KERNEL);
+                       if (!entry)
+                               return -ENOMEM;
+
+                       list_add(&entry->l_entry, rg_list);
+                       grp = &entry->r_group;
+                       (*recp_cnt)++;
                }
 
+               grp->pairs[grp->n_val_pairs].prot_id =
+                       lkup_exts->fv_words[j].prot_id;
+               grp->pairs[grp->n_val_pairs].off = lkup_exts->fv_words[j].off;
+               grp->mask[grp->n_val_pairs] = lkup_exts->field_mask[j];
+               grp->n_val_pairs++;
+       }
+
        return 0;
 }