From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E4AFC43613 for ; Mon, 24 Jun 2019 10:13:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 44625205C9 for ; Mon, 24 Jun 2019 10:13:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561371215; bh=/HOzZ3tUCI58Vzm6Y/06mjVC11/HSZIq3LWJHbOOqJU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hONPOvkFQ5YC2B6aYgPJnSRITIFyer5jInxXGY8JQAXq8hAEqeasllSPcm2Dp/Gka run/cvaKIcaIKIxS+Az0qND7bzR16l9XvTTP8Ro0re4M+a9l92AP6EneDwZMVodHpo 4ik9hyhuzIfxaXautRXH782wGfMHWe8FF7fWbOow= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728369AbfFXKNe (ORCPT ); Mon, 24 Jun 2019 06:13:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:50434 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729927AbfFXKNe (ORCPT ); Mon, 24 Jun 2019 06:13:34 -0400 Received: from localhost (f4.8f.5177.ip4.static.sl-reverse.com [119.81.143.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EC1CD208E3; Mon, 24 Jun 2019 10:13:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561371213; bh=/HOzZ3tUCI58Vzm6Y/06mjVC11/HSZIq3LWJHbOOqJU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fDwtgCPF5Sa2dRLAWAnS+yD/0L0GNJy7O9c5RtSTGhwSJ97njRe9exxcPXOsn7rCr 4lZNj1Fotc//qan3kGLnZr+1zPilthqKS2PAHfZkaTXlxZAodYVfUga2RaG9dLCjOp IsufxfZk74PQvVujGxkMyJVdJtU4JgAkWFTdIU1U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nikita Yushchenko , Vivien Didelot , "David S. Miller" , Sasha Levin Subject: [PATCH 5.1 063/121] net: dsa: mv88e6xxx: avoid error message on remove from VLAN 0 Date: Mon, 24 Jun 2019 17:56:35 +0800 Message-Id: <20190624092323.999051754@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190624092320.652599624@linuxfoundation.org> References: <20190624092320.652599624@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 62394708f3e01c9f2be6be74eb6305bae1ed924f ] When non-bridged, non-vlan'ed mv88e6xxx port is moving down, error message is logged: failed to kill vid 0081/0 for device eth_cu_1000_4 This is caused by call from __vlan_vid_del() with vin set to zero, over call chain this results into _mv88e6xxx_port_vlan_del() called with vid=0, and mv88e6xxx_vtu_get() called from there returns -EINVAL. On symmetric path moving port up, call goes through mv88e6xxx_port_vlan_prepare() that calls mv88e6xxx_port_check_hw_vlan() that returns -EOPNOTSUPP for zero vid. This patch changes mv88e6xxx_vtu_get() to also return -EOPNOTSUPP for zero vid, then this error code is explicitly cleared in dsa_slave_vlan_rx_kill_vid() and error message is no longer logged. Signed-off-by: Nikita Yushchenko Reviewed-by: Vivien Didelot Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/dsa/mv88e6xxx/chip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 720f1dde2c2d..ae750ab9a4d7 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -1517,7 +1517,7 @@ static int mv88e6xxx_vtu_get(struct mv88e6xxx_chip *chip, u16 vid, int err; if (!vid) - return -EINVAL; + return -EOPNOTSUPP; entry->vid = vid - 1; entry->valid = false; -- 2.20.1