Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Clark Wang <xiaoning.wang@nxp.com>
To:     peppe.cavallaro@st.com, alexandre.torgue@foss.st.com,
        joabreu@synopsys.com, davem@davemloft.net, edumazet@google.com,
        kuba@kernel.org, pabeni@redhat.com, mcoquelin.stm32@gmail.com
Cc:     netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH] net: stmmac: remove the limitation of adding vlan in promisc mode
Date:   Mon,  3 Apr 2023 16:17:17 +0800
Message-Id: <20230403081717.2047939-1-xiaoning.wang@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?tczwPKdOFtF+vtKN4uADmcSo/RbF2QHQvP2SrSEDcWVaw1SquTr1Mjc8pSzt?=
 =?us-ascii?Q?Z7mwCP6gUL5Es/VeOkkXNf7hGgj1u/gQE5CwxOH/QFAWoB5iHHZRtx5TFD7R?=
 =?us-ascii?Q?lXh3FtKLWR+UJkBKT5J1l1KIPcuEjQuHc0Zhn9CsXBL0VNKgaCdmjdvTrJlA?=
 =?us-ascii?Q?Kb3iry/fp0iQhlJOdSwdb00xy+N/Q7QGMLm5Mzp9WXUSHDFoZZTmkDYyHM3M?=
 =?us-ascii?Q?A134o2ZS3V+7oUG5TGTUDkI2S9VcdmUU3g6+onOG7pXhO+zJXV8cjlqOyNMp?=
 =?us-ascii?Q?/3Tg8633LbF7VK1FIjrf/8wrg7KRf4YNdeEm/8+AfGZTx13mQC0l0gkCSyDm?=
 =?us-ascii?Q?RhroxZ/c8S6FmNV0/XIlkb/XdJK2oksGn/SZu7MCzhg5jC+BN03+fh3aFPHs?=
 =?us-ascii?Q?ArhNcbav98aQnj26uS+r5iSBSSHvglpRHYqR6OHdtnuJImSGt3KzUF1RRcj2?=
 =?us-ascii?Q?1v4SpMl+/t+marRYckk/e7H+lo1QPOtNw2W06BxBLeOEIFqW33e4RW/PT05c?=
 =?us-ascii?Q?uPbe6oCOtTalp7EnD0TZ1dK8fy6DTwHZqCURWzaRraTy1xcxTUM1kxhTZ16Q?=
 =?us-ascii?Q?26jfE8tqoTLQSqKPw1Q+B0DjGYWOVPE5Tf93IiEkdIt+3WLirg0Dlcyamsrm?=
 =?us-ascii?Q?2VgCMiJy4zszhcVxYeMReD+IcVz0OiA6N9Y9j6J39CYuI2tTXOwZqoULtvvA?=
 =?us-ascii?Q?JwMUQRKF4QiqHq7uHsM8X6326UkDSu/hKazlTf9WSbFpKZJiryPqfizRuHD5?=
 =?us-ascii?Q?mhVSAc8rtGPz/GZwrNn05VPjTODcpJG3LL6I8R23JkmZKYC4Z/RxVZ5BRl4C?=
 =?us-ascii?Q?Rg0yxH3wjKDVLSEq/VuoWN+8PQnMMZL/bWc/Kc2vLcF2djqsHiIu+Yas20Dx?=
 =?us-ascii?Q?hdCr1D3p5jxVVBAL5/OH80Qh8a2LDXeigqUkhWSl4WOFzAKuwb1Jb2wj9TTo?=
 =?us-ascii?Q?T6SB2qo5hueei+V5Fhv7JCE1eSOukeU+6PiRzX9AMnMoR1qwjGYnhEc1QeBf?=
 =?us-ascii?Q?e49ZF3D5VzyF9Sp/TYsCN8mbB4RSIkTETDEkrITRXSaFKYOKtRY06ZAmwxH4?=
 =?us-ascii?Q?3Rt9EqF7Frf8VIX7wYfb4m6Rk/vcdjI8NCgUhUO+sJHYqXCKdhZ8uYljlHZk?=
 =?us-ascii?Q?lLNKj18/OXaNDDQPUErVbPEowFlSaEBmzvxq+xqGpPph4sGAX7ikMFSGQE25?=
 =?us-ascii?Q?kVSxSr8oVgkIL15rGjQ6d2rN1xwSGdBkMbTap+TjU89rP/oCYEITh8pMRh0V?=
 =?us-ascii?Q?mLpB/SMiyKgPXrZJLLb7ldKahESk8VHGje6MZ8Mh21eajvorgksiZf/fL2H9?=
 =?us-ascii?Q?3XcJdbma/aJe6cKKuUG/G28hErGVp+iEUmPmH0bKNa5W61dnHhA4ciBad6v3?=
 =?us-ascii?Q?y1AV1Qb6w81nc181rueurB+Hqlgk4XNRwS4suthMPqAdznu9IvtRSLcxMxIH?=
 =?us-ascii?Q?UphGOwtlnE016zONkhrc2z7Z9VuSdSAczP0nBezvpYlgZlyBh5neBZps6e1f?=
 =?us-ascii?Q?NRBxDc+KmOI/0Roem7b0z90JObWReND0SmCl0JikVhZuuVP/+2CG98Mn7+kL?=
 =?us-ascii?Q?AFzlje8yfe0EKGgHnj7wZiuOCQ8ytlsoPEs9mwvL?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 498d2df6-9eee-49b2-b39e-08db341df6eb
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5089.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2023 08:32:30.7209
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: wzPYr5ZTi3nNCcimlnM28mwNx5IGPQKUDcTBTna/toU1LLTiWIB1iYG0oe8AfR6Tg4eHqNm6Tixo3MVYQtbXtg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8484
X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS autolearn=unavailable autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

When using brctl to add eqos to a bridge, it will frist set eqos to
promisc mode and then set a VLAN for this bridge with a filer VID value
of 1.

These two error returns limit the use of brctl, resulting in the
inability of the bridge to be enabled on eqos. So remove them.

Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>
---
 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
index 8c7a0b7c9952..64bbe15a699e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
@@ -472,12 +472,6 @@ static int dwmac4_add_hw_vlan_rx_fltr(struct net_device *dev,
 	if (vid > 4095)
 		return -EINVAL;
 
-	if (hw->promisc) {
-		netdev_err(dev,
-			   "Adding VLAN in promisc mode not supported\n");
-		return -EPERM;
-	}
-
 	/* Single Rx VLAN Filter */
 	if (hw->num_vlan == 1) {
 		/* For single VLAN filter, VID 0 means VLAN promiscuous */
@@ -527,12 +521,6 @@ static int dwmac4_del_hw_vlan_rx_fltr(struct net_device *dev,
 {
 	int i, ret = 0;
 
-	if (hw->promisc) {
-		netdev_err(dev,
-			   "Deleting VLAN in promisc mode not supported\n");
-		return -EPERM;
-	}
-
 	/* Single Rx VLAN Filter */
 	if (hw->num_vlan == 1) {
 		if ((hw->vlan_filter[0] & GMAC_VLAN_TAG_VID) == vid) {
-- 
2.34.1