Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp3038879pxb; Mon, 18 Oct 2021 07:06:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaSdSdHXaOrm1+tyl93yuuFvPvO3xaZDRhFuy0brlJystoALJyah662IMkfT0JbYdDR2DZ X-Received: by 2002:a17:902:7243:b0:13f:505b:5710 with SMTP id c3-20020a170902724300b0013f505b5710mr27256614pll.36.1634565975679; Mon, 18 Oct 2021 07:06:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634565975; cv=none; d=google.com; s=arc-20160816; b=CV3vEKUp6QNAgK1TDW5xWjw/rjKalLz9pmnnOe8fuGI04KxYHSydLUAFFCae8xyOyq NEOD7CAy75Qs4umfsq0j1jhFTAIiLNoEPsyTiuddhCU22d72e8zj72s3jzik5A5hGO7j IUBT0gyzOEoDh4xZR/Xkcmp8YsvOBG/Wn7kgFOMscdgfXoUYSG9v5eEiC2dZVBTxrAZp joXaFzrMfWIxurr8sTKLIrlmShZ8uRrPOIbDUvFfcSdwZ5/YJ+v5R0Y0MGtlzg5y9H9J QFegsFBC7R0NGnZ1uVZDG0LehPsRYEy/6HOLFzF9Cs8gMaleQiWxwvqoWhw1ThiBimel qB6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=H1/wCGwPTjbMdMpDrjs5jHdl7nVEZKsQJF2aNHVeO6E=; b=NH99NipfZIW5/H3Rj/hZTMTNk8mQqQn8A/uvxwUo05SpHXuiGFuqOBHWh/nLTOX7RO Fe5RUcUgOBuINQcQAzcGx4QYFud7IllIadvk3EXjhmJCHl6poWMuCeIHnBeUzIlCl4g9 y8ljYgqDHTUAMr+4uF+jDfvmTrUNxiGcgDp7rELcH++g93eVYQ30I70D2ekk5GgJdy/E 0MWZJPa4cp5hgIrFdDsAP7EH760G4b4hJBz2ADc8h0Oixrd/fwHV3wsCA8mXVpR+1YA4 oOzqvi04b0mMpzEQ3osM7QadAEWeZO8nYytjQIE0c0Mct+4sEf0BuSaHf5uLnPxJuHK5 Pk5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jZ1+7mPc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g17si14907785pgk.528.2021.10.18.07.06.02; Mon, 18 Oct 2021 07:06:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jZ1+7mPc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233067AbhJROFw (ORCPT + 99 others); Mon, 18 Oct 2021 10:05:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:41656 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233271AbhJROCQ (ORCPT ); Mon, 18 Oct 2021 10:02:16 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2FFD76103D; Mon, 18 Oct 2021 13:43:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1634564581; bh=8T5tzKoxcRi2/Mgoz3xkE7pPt8swmep6grCBvCsKd5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jZ1+7mPc0QlmpL0pua1tWm0OSOLOHdMH6mDQ87t+TDVTmfwA4DZC+t/hVUW1ir2Da OCnuV0tbcjUIqfxBHrj8l+MZPZ64ebrHO8UQImuwicH13cL+X+Y+FRBhrVifB4gHsn 4RZyH3sgSlpX72A9sKoj+RqfPIjcvGj2cU6mVFg4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Alvin=20=C5=A0ipraga?= , Vladimir Oltean , Florian Fainelli , Jakub Kicinski Subject: [PATCH 5.14 111/151] net: dsa: fix spurious error message when unoffloaded port leaves bridge Date: Mon, 18 Oct 2021 15:24:50 +0200 Message-Id: <20211018132344.279511989@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211018132340.682786018@linuxfoundation.org> References: <20211018132340.682786018@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alvin Šipraga commit 43a4b4dbd48c9006ef64df3a12acf33bdfe11c61 upstream. Flip the sign of a return value check, thereby suppressing the following spurious error: port 2 failed to notify DSA_NOTIFIER_BRIDGE_LEAVE: -EOPNOTSUPP ... which is emitted when removing an unoffloaded DSA switch port from a bridge. Fixes: d371b7c92d19 ("net: dsa: Unset vlan_filtering when ports leave the bridge") Signed-off-by: Alvin Šipraga Reviewed-by: Vladimir Oltean Reviewed-by: Florian Fainelli Link: https://lore.kernel.org/r/20211012112730.3429157-1-alvin@pqrs.dk Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/dsa/switch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/dsa/switch.c +++ b/net/dsa/switch.c @@ -148,7 +148,7 @@ static int dsa_switch_bridge_leave(struc if (extack._msg) dev_err(ds->dev, "port %d: %s\n", info->port, extack._msg); - if (err && err != EOPNOTSUPP) + if (err && err != -EOPNOTSUPP) return err; } return 0;