i40e: Remove flags field from i40e_veb

The field is initialized always to zero and it is never read.
Remove it.

Reviewed-by: Michal Schmidt <mschmidt@redhat.com>
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com>
Signed-off-by: Ivan Vecera <ivecera@redhat.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index 2fbabcdb5bb5f39264d7368f45ca4240902ebbdf..5248e78f784902530180a893258c0bbe6fa117ce 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -788,7 +788,6 @@ struct i40e_veb {
        u16 stats_idx;          /* index of VEB parent */
        u8  enabled_tc;
        u16 bridge_mode;        /* Bridge Mode (VEB/VEPA) */
-       u16 flags;
        u16 bw_limit;
        u8  bw_max_quanta;
        bool is_abs_credits;
@@ -1213,7 +1212,7 @@ void i40e_vsi_stop_rings(struct i40e_vsi *vsi);
 void i40e_vsi_stop_rings_no_wait(struct  i40e_vsi *vsi);
 int i40e_vsi_wait_queues_disabled(struct i40e_vsi *vsi);
 int i40e_reconfig_rss_queues(struct i40e_pf *pf, int queue_count);
-struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags, u16 uplink_seid,
+struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 uplink_seid,
                                u16 downlink_seid, u8 enabled_tc);
 void i40e_veb_release(struct i40e_veb *veb);
 

diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
index f9ba45f596c96dd6c208b354399c6dcea7c23638..6147c5f128e866edeeed48921079578a1834d828 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
@@ -867,7 +867,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
                        goto command_write_done;
                }
 
-               veb = i40e_veb_setup(pf, 0, uplink_seid, vsi_seid, enabled_tc);
+               veb = i40e_veb_setup(pf, uplink_seid, vsi_seid, enabled_tc);
                if (veb)
                        dev_info(&pf->pdev->dev, "added relay %d\n", veb->seid);
                else

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index bcc99a6676f95504371a1d4918ca7319f31aa98a..e27b2aa544b63feccee5d5fd73e6199c15854ff1 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -13127,7 +13127,7 @@ static int i40e_ndo_bridge_setlink(struct net_device *dev,
 
                /* Insert a new HW bridge */
                if (!veb) {
-                       veb = i40e_veb_setup(pf, 0, vsi->uplink_seid, vsi->seid,
+                       veb = i40e_veb_setup(pf, vsi->uplink_seid, vsi->seid,
                                             vsi->tc_config.enabled_tc);
                        if (veb) {
                                veb->bridge_mode = mode;
@@ -14383,10 +14383,10 @@ struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type,
                }
 
                if (vsi->uplink_seid == pf->mac_seid)
-                       veb = i40e_veb_setup(pf, 0, pf->mac_seid, vsi->seid,
+                       veb = i40e_veb_setup(pf, pf->mac_seid, vsi->seid,
                                             vsi->tc_config.enabled_tc);
                else if ((vsi->flags & I40E_VSI_FLAG_VEB_OWNER) == 0)
-                       veb = i40e_veb_setup(pf, 0, vsi->uplink_seid, vsi->seid,
+                       veb = i40e_veb_setup(pf, vsi->uplink_seid, vsi->seid,
                                             vsi->tc_config.enabled_tc);
                if (veb) {
                        if (vsi->seid != pf->vsi[pf->lan_vsi]->seid) {
@@ -14780,7 +14780,6 @@ static int i40e_add_veb(struct i40e_veb *veb, struct i40e_vsi *vsi)
 /**
  * i40e_veb_setup - Set up a VEB
  * @pf: board private structure
- * @flags: VEB setup flags
  * @uplink_seid: the switch element to link to
  * @vsi_seid: the initial VSI seid
  * @enabled_tc: Enabled TC bit-map
@@ -14793,9 +14792,8 @@ static int i40e_add_veb(struct i40e_veb *veb, struct i40e_vsi *vsi)
  * Returns pointer to the successfully allocated VEB sw struct on
  * success, otherwise returns NULL on failure.
  **/
-struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags,
-                               u16 uplink_seid, u16 vsi_seid,
-                               u8 enabled_tc)
+struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 uplink_seid,
+                               u16 vsi_seid, u8 enabled_tc)
 {
        struct i40e_vsi *vsi = NULL;
        struct i40e_veb *veb;
@@ -14826,7 +14824,6 @@ struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags,
        if (veb_idx < 0)
                goto err_alloc;
        veb = pf->veb[veb_idx];
-       veb->flags = flags;
        veb->uplink_seid = uplink_seid;
        veb->enabled_tc = (enabled_tc ? enabled_tc : 0x1);