| From cc019545a238518fa9da1e2a889f6e1bb1005a63 Mon Sep 17 00:00:00 2001 |
| From: Maciej Fijalkowski <maciej.fijalkowski@intel.com> |
| Date: Thu, 7 Jul 2022 12:20:43 +0200 |
| Subject: ice: do not setup vlan for loopback VSI |
| |
| From: Maciej Fijalkowski <maciej.fijalkowski@intel.com> |
| |
| commit cc019545a238518fa9da1e2a889f6e1bb1005a63 upstream. |
| |
| Currently loopback test is failiing due to the error returned from |
| ice_vsi_vlan_setup(). Skip calling it when preparing loopback VSI. |
| |
| Fixes: 0e674aeb0b77 ("ice: Add handler for ethtool selftest") |
| Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> |
| Tested-by: George Kuruvinakunnel <george.kuruvinakunnel@intel.com> |
| Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/intel/ice/ice_main.c | 8 +++++--- |
| 1 file changed, 5 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/net/ethernet/intel/ice/ice_main.c |
| +++ b/drivers/net/ethernet/intel/ice/ice_main.c |
| @@ -5481,10 +5481,12 @@ int ice_vsi_cfg(struct ice_vsi *vsi) |
| if (vsi->netdev) { |
| ice_set_rx_mode(vsi->netdev); |
| |
| - err = ice_vsi_vlan_setup(vsi); |
| + if (vsi->type != ICE_VSI_LB) { |
| + err = ice_vsi_vlan_setup(vsi); |
| |
| - if (err) |
| - return err; |
| + if (err) |
| + return err; |
| + } |
| } |
| ice_vsi_cfg_dcb_rings(vsi); |
| |