projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
92790e6
)
net: dsa: lantiq_gswip: remove duplicate assignment to vlan_mapping.val[0]
author
Vladimir Oltean
<vladimir.oltean@nxp.com>
Wed, 15 Oct 2025 22:32:30 +0000
(23:32 +0100)
committer
Jakub Kicinski
<kuba@kernel.org>
Sat, 18 Oct 2025 00:54:58 +0000
(17:54 -0700)
When idx == -1 in gswip_vlan_add(), we set vlan_mapping.val[0] = vid,
even though we do the exact same thing again outside the if/else block.
Remove the duplicate assignment.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Link:
https://patch.msgid.link/039ecb48e038cea856a9a6230ad1543db2bc382d.1760566491.git.daniel@makrotopia.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/dsa/lantiq/lantiq_gswip.c
patch
|
blob
|
history
diff --git
a/drivers/net/dsa/lantiq/lantiq_gswip.c
b/drivers/net/dsa/lantiq/lantiq_gswip.c
index
9526317
..
e41d67e
100644
(file)
--- a/
drivers/net/dsa/lantiq/lantiq_gswip.c
+++ b/
drivers/net/dsa/lantiq/lantiq_gswip.c
@@
-848,8
+848,6
@@
static int gswip_vlan_add_aware(struct gswip_priv *priv,
vlan_mapping.index = idx;
vlan_mapping.table = GSWIP_TABLE_VLAN_MAPPING;
- /* VLAN ID byte, maps to the VLAN ID of vlan active table */
- vlan_mapping.val[0] = vid;
} else {
/* Read the existing VLAN mapping entry from the switch */
vlan_mapping.index = idx;
@@
-862,6
+860,7
@@
static int gswip_vlan_add_aware(struct gswip_priv *priv,
}
}
+ /* VLAN ID byte, maps to the VLAN ID of vlan active table */
vlan_mapping.val[0] = vid;
/* Update the VLAN mapping entry and write it to the switch */
vlan_mapping.val[1] |= cpu_ports;