Skip to content

Commit

Permalink
net: dsa: microchip: ksz8: move all DSA configurations to one location
Browse files Browse the repository at this point in the history
To make the code more comparable to KSZ9477 code, move DSA
configurations to the same location.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Acked-by: Arun Ramadoss <arun.ramadoss@microchip.com>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  • Loading branch information
Oleksij Rempel authored and Paolo Abeni committed Dec 7, 2022
1 parent 6b30cfa commit 55a952e
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions drivers/net/dsa/microchip/ksz8795.c
Original file line number Diff line number Diff line change
Expand Up @@ -1359,6 +1359,16 @@ int ksz8_setup(struct dsa_switch *ds)

ds->mtu_enforcement_ingress = true;

/* We rely on software untagging on the CPU port, so that we
* can support both tagged and untagged VLANs
*/
ds->untag_bridge_pvid = true;

/* VLAN filtering is partly controlled by the global VLAN
* Enable flag
*/
ds->vlan_filtering_is_global = true;

ksz_cfg(dev, S_REPLACE_VID_CTRL, SW_FLOW_CTRL, true);

/* Enable automatic fast aging when link changed detected. */
Expand Down Expand Up @@ -1418,16 +1428,6 @@ int ksz8_switch_init(struct ksz_device *dev)
dev->phy_port_cnt = dev->info->port_cnt - 1;
dev->port_mask = (BIT(dev->phy_port_cnt) - 1) | dev->info->cpu_ports;

/* We rely on software untagging on the CPU port, so that we
* can support both tagged and untagged VLANs
*/
dev->ds->untag_bridge_pvid = true;

/* VLAN filtering is partly controlled by the global VLAN
* Enable flag
*/
dev->ds->vlan_filtering_is_global = true;

return 0;
}

Expand Down

0 comments on commit 55a952e

Please sign in to comment.