diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-01 21:30:24 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-01 21:30:24 +0900 |
| commit | 1f2c897cb1ceb97cd6060eac353754fe926cb3be (patch) | |
| tree | b545bef2c57085b3566c09ee6b0a8d95f3abad9d /drivers | |
| parent | a95157d72d638913422773ea6faa384ebe4d366d (diff) | |
| parent | f849772915e5501c25f69f4815daa8cd86194634 (diff) | |
| download | op-kernel-dev-1f2c897cb1ceb97cd6060eac353754fe926cb3be.zip op-kernel-dev-1f2c897cb1ceb97cd6060eac353754fe926cb3be.tar.gz | |
Merge branch 'lan9303-Fix-STP-and-flooding-issues'
Egil Hjelmeland says:
====================
net: dsa: lan9303: Fix STP and flooding issues
This patch set finishes the STP support, and fixes flooding issues.
Patch 1 fixes a flooding issue in the previous patch set.
Patch 2 finishes STP support by adding a ALR entry.
Patch 3 prevent duplicate flooding in HW and SW bridge.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/dsa/lan9303-core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c index 4c412bd..c4afc8f 100644 --- a/drivers/net/dsa/lan9303-core.c +++ b/drivers/net/dsa/lan9303-core.c @@ -773,6 +773,7 @@ static int lan9303_separate_ports(struct lan9303 *chip) { int ret; + lan9303_alr_del_port(chip, eth_stp_addr, 0); ret = lan9303_write_switch_reg(chip, LAN9303_SWE_PORT_MIRROR, LAN9303_SWE_PORT_MIRROR_SNIFFER_PORT0 | LAN9303_SWE_PORT_MIRROR_MIRRORED_PORT1 | @@ -797,6 +798,7 @@ static void lan9303_bridge_ports(struct lan9303 *chip) lan9303_write_switch_reg(chip, LAN9303_SWE_PORT_STATE, chip->swe_port_state); + lan9303_alr_add_port(chip, eth_stp_addr, 0, true); } static int lan9303_handle_reset(struct lan9303 *chip) |
