From patchwork Fri Jun 10 15:09:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fijalkowski, Maciej" X-Patchwork-Id: 12877691 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D265C43334 for ; Fri, 10 Jun 2022 15:09:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245589AbiFJPJ5 (ORCPT ); Fri, 10 Jun 2022 11:09:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238613AbiFJPJt (ORCPT ); Fri, 10 Jun 2022 11:09:49 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51A9613FBDF; Fri, 10 Jun 2022 08:09:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1654873788; x=1686409788; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=E/K7amBbEDth3NReCcX2252oAnlSIAbczMte3QzBTE4=; b=g+29o6iyYfvKWR/zunY58+YWQlW+bNTaXfwcMvH7XAA01fbF9YWsZjBV uyeYT3onw+hz7x2gcUkslKRVOTyS6ysTtjoGO2XQx1y+8yrmwBloPvNDb ZT3yhB2oZQw1EdBQd5I0x+cR1umr7GDd5XkoAIQzN3x8DKrTg0ZZcuYqV uS+/KNRFZo6tml3uMwtfqeM0U1PrQeJsQVVL6zc1L1+AuqpLRmPWD9G29 LikRmQJc5DLFNwRLTwwTxidiUPFokk2eKQoar+R/D6EgKERvF9PBnsZ13 6kw93ThDR5lM0TNbgE45XxY+Xer955VEIaOU3AwPLIyQw8Ft9xcdCAwEB Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10374"; a="278788454" X-IronPort-AV: E=Sophos;i="5.91,290,1647327600"; d="scan'208";a="278788454" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2022 08:09:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,290,1647327600"; d="scan'208";a="638176207" Received: from boxer.igk.intel.com ([10.102.20.173]) by fmsmga008.fm.intel.com with ESMTP; 10 Jun 2022 08:09:46 -0700 From: Maciej Fijalkowski To: bpf@vger.kernel.org, ast@kernel.org, daniel@iogearbox.net Cc: netdev@vger.kernel.org, magnus.karlsson@intel.com, bjorn@kernel.org, Maciej Fijalkowski Subject: [PATCH bpf-next 03/10] ice: do not setup vlan for loopback VSI Date: Fri, 10 Jun 2022 17:09:16 +0200 Message-Id: <20220610150923.583202-4-maciej.fijalkowski@intel.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220610150923.583202-1-maciej.fijalkowski@intel.com> References: <20220610150923.583202-1-maciej.fijalkowski@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net Currently loopback test is failing due to the error returned from ice_vsi_vlan_setup(). Skip calling it when preparing loopback VSI. Signed-off-by: Maciej Fijalkowski --- drivers/net/ethernet/intel/ice/ice_main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index e1cae253412c..08b44e43bcfa 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -5997,10 +5997,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);