75cd4ef48d
Replace recently added patches with version accepted upstream. Signed-off-by: Martin Schiller <ms@dev.tdt.de> Link: https://github.com/openwrt/openwrt/pull/15811 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From e19fbe3996aae35a467ebad35ff2b8d84975a65c Mon Sep 17 00:00:00 2001
|
|
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
|
Date: Tue, 11 Jun 2024 15:54:33 +0200
|
|
Subject: net: dsa: lantiq_gswip: Update comments in
|
|
gswip_port_vlan_filtering()
|
|
|
|
Update the comments in gswip_port_vlan_filtering() so it's clear that
|
|
there are two separate cases, one for "tag based VLAN" and another one
|
|
for "port based VLAN".
|
|
|
|
Suggested-by: Martin Schiller <ms@dev.tdt.de>
|
|
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
|
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
|
|
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
|
|
Link: https://lore.kernel.org/r/20240611135434.3180973-12-ms@dev.tdt.de
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/dsa/lantiq_gswip.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/lantiq_gswip.c
|
|
+++ b/drivers/net/dsa/lantiq_gswip.c
|
|
@@ -773,7 +773,7 @@ static int gswip_port_vlan_filtering(str
|
|
}
|
|
|
|
if (vlan_filtering) {
|
|
- /* Use port based VLAN tag */
|
|
+ /* Use tag based VLAN */
|
|
gswip_switch_mask(priv,
|
|
GSWIP_PCE_VCTRL_VSR,
|
|
GSWIP_PCE_VCTRL_UVR | GSWIP_PCE_VCTRL_VIMR |
|
|
@@ -782,7 +782,7 @@ static int gswip_port_vlan_filtering(str
|
|
gswip_switch_mask(priv, GSWIP_PCE_PCTRL_0_TVM, 0,
|
|
GSWIP_PCE_PCTRL_0p(port));
|
|
} else {
|
|
- /* Use port based VLAN tag */
|
|
+ /* Use port based VLAN */
|
|
gswip_switch_mask(priv,
|
|
GSWIP_PCE_VCTRL_UVR | GSWIP_PCE_VCTRL_VIMR |
|
|
GSWIP_PCE_VCTRL_VEMR,
|