| Message ID | 20230612141730.331674-1-maciej.fijalkowski@intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [iwl-next] ice: use ice_down_up() where applicable | expand |
On 6/12/23 16:17, Maciej Fijalkowski wrote: > ice_change_mtu() is currently using a separate ice_down() and ice_up() > calls to reflect changed MTU. ice_down_up() serves this purpose, so do > the refactoring here. > > Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> > --- > drivers/net/ethernet/intel/ice/ice_main.c | 12 ++---------- > 1 file changed, 2 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c > index a1f7c8edc22f..609df077c314 100644 > --- a/drivers/net/ethernet/intel/ice/ice_main.c > +++ b/drivers/net/ethernet/intel/ice/ice_main.c > @@ -7634,17 +7634,9 @@ static int ice_change_mtu(struct net_device *netdev, int new_mtu) > > /* if VSI is up, bring it down and then back up */ > if (!test_and_set_bit(ICE_VSI_DOWN, vsi->state)) { I would remove the above if(), as ice_down_up() starts with: if (test_and_set_bit(ICE_VSI_DOWN, vsi->state)) return 0; which, with your change applied would just return 0. > - err = ice_down(vsi); > - if (err) { > - netdev_err(netdev, "change MTU if_down err %d\n", err); > - return err; > - } > - > - err = ice_up(vsi); > - if (err) { > - netdev_err(netdev, "change MTU if_up err %d\n", err); > + err = ice_down_up(vsi); > + if (err) > return err; > - } > } > > netdev_dbg(netdev, "changed MTU to %d\n", new_mtu);
On Tue, Jun 13, 2023 at 12:25:08PM +0200, Przemek Kitszel wrote: > On 6/12/23 16:17, Maciej Fijalkowski wrote: > > ice_change_mtu() is currently using a separate ice_down() and ice_up() > > calls to reflect changed MTU. ice_down_up() serves this purpose, so do > > the refactoring here. > > > > Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> > > --- > > drivers/net/ethernet/intel/ice/ice_main.c | 12 ++---------- > > 1 file changed, 2 insertions(+), 10 deletions(-) > > > > diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c > > index a1f7c8edc22f..609df077c314 100644 > > --- a/drivers/net/ethernet/intel/ice/ice_main.c > > +++ b/drivers/net/ethernet/intel/ice/ice_main.c > > @@ -7634,17 +7634,9 @@ static int ice_change_mtu(struct net_device *netdev, int new_mtu) > > /* if VSI is up, bring it down and then back up */ > > if (!test_and_set_bit(ICE_VSI_DOWN, vsi->state)) { > > I would remove the above if(), as ice_down_up() starts with: > if (test_and_set_bit(ICE_VSI_DOWN, vsi->state)) > return 0; > > which, with your change applied would just return 0. Yes, thanks a lot for paying attention, sending v2 shortly. > > > > - err = ice_down(vsi); > > - if (err) { > > - netdev_err(netdev, "change MTU if_down err %d\n", err); > > - return err; > > - } > > - > > - err = ice_up(vsi); > > - if (err) { > > - netdev_err(netdev, "change MTU if_up err %d\n", err); > > + err = ice_down_up(vsi); > > + if (err) > > return err; > > - } > > } > > netdev_dbg(netdev, "changed MTU to %d\n", new_mtu); >
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index a1f7c8edc22f..609df077c314 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -7634,17 +7634,9 @@ static int ice_change_mtu(struct net_device *netdev, int new_mtu) /* if VSI is up, bring it down and then back up */ if (!test_and_set_bit(ICE_VSI_DOWN, vsi->state)) { - err = ice_down(vsi); - if (err) { - netdev_err(netdev, "change MTU if_down err %d\n", err); - return err; - } - - err = ice_up(vsi); - if (err) { - netdev_err(netdev, "change MTU if_up err %d\n", err); + err = ice_down_up(vsi); + if (err) return err; - } } netdev_dbg(netdev, "changed MTU to %d\n", new_mtu);
ice_change_mtu() is currently using a separate ice_down() and ice_up() calls to reflect changed MTU. ice_down_up() serves this purpose, so do the refactoring here. Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> --- drivers/net/ethernet/intel/ice/ice_main.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)