TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: dsa: lan9303: Add STP ALR entry on port 0

Browse Source 
STP BPDUs arriving on user ports must sent to CPU port only,
for processing by the SW bridge.

Add an ALR entry with STP state override to fix that.

Signed-off-by: Egil Hjelmeland <privat@egil-hjelmeland.no>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Egil Hjelmeland
2017-10-31 15:48:01 +01:00
committed by David S. Miller
parent 909fb9ae32
commit e9292f2c03
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/dsa/lan9303-core.c
+2
View File
@@ -773,6 +773,7 @@ static int lan9303_separate_ports(struct lan9303 *chip)
{ {
int ret; int ret;
lan9303_alr_del_port(chip, eth_stp_addr, 0);
ret = lan9303_write_switch_reg(chip, LAN9303_SWE_PORT_MIRROR, ret = lan9303_write_switch_reg(chip, LAN9303_SWE_PORT_MIRROR,
LAN9303_SWE_PORT_MIRROR_SNIFFER_PORT0 | LAN9303_SWE_PORT_MIRROR_SNIFFER_PORT0 |
LAN9303_SWE_PORT_MIRROR_MIRRORED_PORT1 | 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, lan9303_write_switch_reg(chip, LAN9303_SWE_PORT_STATE,
chip->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) static int lan9303_handle_reset(struct lan9303 *chip)
include/linux/dsa/lan9303.h
+2
View File
@@ -34,3 +34,5 @@ struct lan9303 {
**/ **/
struct lan9303_alr_cache_entry alr_cache[LAN9303_NUM_ALR_RECORDS]; struct lan9303_alr_cache_entry alr_cache[LAN9303_NUM_ALR_RECORDS];
}; };
#define eth_stp_addr eth_reserved_addr_base
net/dsa/tag_lan9303.c
-1
View File
@@ -42,7 +42,6 @@
#define LAN9303_TAG_LEN 4 #define LAN9303_TAG_LEN 4
# define LAN9303_TAG_TX_USE_ALR BIT(3) # define LAN9303_TAG_TX_USE_ALR BIT(3)
# define LAN9303_TAG_TX_STP_OVERRIDE BIT(4) # define LAN9303_TAG_TX_STP_OVERRIDE BIT(4)
#define eth_stp_addr eth_reserved_addr_base
/* Decide whether to transmit using ALR lookup, or transmit directly to /* Decide whether to transmit using ALR lookup, or transmit directly to
* port using tag. ALR learning is performed only when using ALR lookup. * port using tag. ALR learning is performed only when using ALR lookup.