Commit 53332f84 authored by Jakub Kicinski's avatar Jakub Kicinski

Merge branch 'lantiq_gswip-two-small-fixes'

Martin Blumenstingl says:

====================
lantiq_gswip: Two small fixes

While updating the Lantiq target in OpenWrt to Linux 5.15 I came across
an FDB related error message. While that still needs to be solved I
found two other small issues on the way.

This series fixes the two minor issues found while revisiting the FDB
code in the lantiq_gswip driver:
- The first patch fixes the start index used in gswip_port_fdb() to
  find the entry with the matching bridge. The updated logic is now
  consistent with the rest of the driver.
- The second patch fixes a typo in a dev_err() message.

[0] https://lore.kernel.org/netdev/20220517194015.1081632-1-martin.blumenstingl@googlemail.com/
====================

Link: https://lore.kernel.org/r/20220518220051.1520023-1-martin.blumenstingl@googlemail.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 86afd5a0 4951995d
...@@ -1360,7 +1360,7 @@ static int gswip_port_fdb(struct dsa_switch *ds, int port, ...@@ -1360,7 +1360,7 @@ static int gswip_port_fdb(struct dsa_switch *ds, int port,
struct net_device *bridge = dsa_port_bridge_dev_get(dsa_to_port(ds, port)); struct net_device *bridge = dsa_port_bridge_dev_get(dsa_to_port(ds, port));
struct gswip_priv *priv = ds->priv; struct gswip_priv *priv = ds->priv;
struct gswip_pce_table_entry mac_bridge = {0,}; struct gswip_pce_table_entry mac_bridge = {0,};
unsigned int cpu_port = priv->hw_info->cpu_port; unsigned int max_ports = priv->hw_info->max_ports;
int fid = -1; int fid = -1;
int i; int i;
int err; int err;
...@@ -1368,7 +1368,7 @@ static int gswip_port_fdb(struct dsa_switch *ds, int port, ...@@ -1368,7 +1368,7 @@ static int gswip_port_fdb(struct dsa_switch *ds, int port,
if (!bridge) if (!bridge)
return -EINVAL; return -EINVAL;
for (i = cpu_port; i < ARRAY_SIZE(priv->vlans); i++) { for (i = max_ports; i < ARRAY_SIZE(priv->vlans); i++) {
if (priv->vlans[i].bridge == bridge) { if (priv->vlans[i].bridge == bridge) {
fid = priv->vlans[i].fid; fid = priv->vlans[i].fid;
break; break;
...@@ -1426,8 +1426,9 @@ static int gswip_port_fdb_dump(struct dsa_switch *ds, int port, ...@@ -1426,8 +1426,9 @@ static int gswip_port_fdb_dump(struct dsa_switch *ds, int port,
err = gswip_pce_table_entry_read(priv, &mac_bridge); err = gswip_pce_table_entry_read(priv, &mac_bridge);
if (err) { if (err) {
dev_err(priv->dev, "failed to write mac bridge: %d\n", dev_err(priv->dev,
err); "failed to read mac bridge entry %d: %d\n",
i, err);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment