Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp850782ybi; Fri, 12 Jul 2019 05:41:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqzq0SKKct9zH6LeuNKZ6D+bEE7WgzsG4Pw7MCwv78elmCSoMsrwsB1zHIpNDEbIFrGGjfNz X-Received: by 2002:a63:bd0a:: with SMTP id a10mr10498537pgf.55.1562935317677; Fri, 12 Jul 2019 05:41:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562935317; cv=none; d=google.com; s=arc-20160816; b=zOUS+H5Oz23RGJhbGRzRnNdnsvRtZuCUCiSSy/MFs2CCgMUjGYezVy2yONpuz/nucn e7E0pKUCdVfGlmY5Cevx3FXUVAWC1CACjDlv7OIVBc87paJ+GoXRcSKmriuDrrNDJ8Mz T+o+iy2JV40UuLcdiAHBg1ub5fXrB9rjPR6w0tNzMjr0EKI0DXLhWd75dtxCS8jZ/2Ol slHgmIkfpdQtm9qFgphRGgKlSQxElWv5OMHvSkMIIYH7mDIAHfcdtf3fJUT+ga3DCpWD Fx6t7kvIRnl+bOcyIXjVKsNzdlHhKIjm5vr2DBqYDUqYdGbX6y1u/1BkBgPkW52gkBXB nkfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ypV7yKApoCSof/O0Q5U+kBhvx/adEPJoKAgJiXIsTUo=; b=nf8oMwmCni3l08cZTU8iH2UCOvijHJX6TWor8EWPEdykcz3Vw8N+vqMRO2Qinjy9nn Jkt0E53lpOLVNR2jQzOHeqli4SFpqjvXo9C+0RXDFi2OU8WksDFgxWfQv7Ra3Y01rFS5 QicHn1WdhhKw+cEGqp5puxv2rtaN+4EegV2vo0rMFT47Mp5V1sFbk3xi2Go0gWrsIXq1 r6wPFOTE4xR8kzThbpUtXKJpyzbJEuOSIrnP411pUZGZqWgTyzI74lxe475xP59Y79GM 0YNJ80X6dThcraEUhugAXfGK7zCKI1Nn+7fy1xDnCnRdP+StP5hZls/vPUYCa8hLx8MP Zv1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=f3QsCR4w; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t130si8164794pgc.237.2019.07.12.05.41.42; Fri, 12 Jul 2019 05:41:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=f3QsCR4w; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728559AbfGLM1M (ORCPT + 99 others); Fri, 12 Jul 2019 08:27:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:39222 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728531AbfGLM1J (ORCPT ); Fri, 12 Jul 2019 08:27:09 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 16493216B7; Fri, 12 Jul 2019 12:27:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562934428; bh=x5hDaKZW4eQWiwA2+MIcbn9cqaun7sC5GdiHc/tgZ5I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f3QsCR4wlAWAnT2PUC39PJNnlC4VNsrEvjsgudq7yLoXKP4/wUng1/lBf+XFulCy5 FENYgG1WPfH5lWl2kLe1cNKlDnVtLmXJQqZlIlUkSV8fVJkx5cir3VyJtQqBlfoGmO BxcXETu8Q5806FTDqOn8Q4Cl8EdkSDyzX3hK7gjQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiri Pirko , Ido Schimmel , "David S. Miller" , Sasha Levin Subject: [PATCH 5.1 052/138] mlxsw: spectrum: Disallow prio-tagged packets when PVID is removed Date: Fri, 12 Jul 2019 14:18:36 +0200 Message-Id: <20190712121630.661230494@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190712121628.731888964@linuxfoundation.org> References: <20190712121628.731888964@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 4b14cc313f076c37b646cee06a85f0db59cf216c ] When PVID is removed from a bridge port, the Linux bridge drops both untagged and prio-tagged packets. Align mlxsw with this behavior. Fixes: 148f472da5db ("mlxsw: reg: Add the Switch Port Acceptable Frame Types register") Acked-by: Jiri Pirko Signed-off-by: Ido Schimmel Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlxsw/reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h index eb4c5e8964cd..5865597577d6 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/reg.h +++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h @@ -997,7 +997,7 @@ static inline void mlxsw_reg_spaft_pack(char *payload, u8 local_port, MLXSW_REG_ZERO(spaft, payload); mlxsw_reg_spaft_local_port_set(payload, local_port); mlxsw_reg_spaft_allow_untagged_set(payload, allow_untagged); - mlxsw_reg_spaft_allow_prio_tagged_set(payload, true); + mlxsw_reg_spaft_allow_prio_tagged_set(payload, allow_untagged); mlxsw_reg_spaft_allow_tagged_set(payload, true); } -- 2.20.1