783c3aace2
This backports some patches for the gswip switch driver. I copied them from this repository: https://github.com/xdarklight/linux/commits/lantiq-gswip-integration-20221022 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> [drop some patches which may break functionality at the moment] Signed-off-by: Martin Schiller <ms@dev.tdt.de>
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From 45a0371568b1f050d787564875653f41a1f6fb98 Mon Sep 17 00:00:00 2001
|
|
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
|
Date: Fri, 14 Oct 2022 14:06:40 +0200
|
|
Subject: [PATCH 741/768] net: dsa: lantiq_gswip: Fix 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>
|
|
---
|
|
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
|
|
@@ -779,7 +779,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 |
|
|
@@ -788,7 +788,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,
|