Commit 1f2c897c authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents a95157d7 f8497729

drivers/net/dsa/lan9303-core.c

+2 −0
Original line number Diff line number Diff line
@@ -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)

include/linux/dsa/lan9303.h

+2 −0
Original line number Diff line number Diff line
@@ -34,3 +34,5 @@ struct lan9303 { 
	 **/

	struct lan9303_alr_cache_entry alr_cache[LAN9303_NUM_ALR_RECORDS];

};



#define eth_stp_addr eth_reserved_addr_base

net/dsa/tag_lan9303.c

+4 −3
Original line number Diff line number Diff line
@@ -42,11 +42,10 @@ 
#define LAN9303_TAG_LEN 4

# define LAN9303_TAG_TX_USE_ALR BIT(3)

# 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

 * port using tag. ALR learning is performed only when using ALR lookup.

 * If the two external ports are bridged and the packet is not STP BPDU,

 * If the two external ports are bridged and the frame is unicast,

 * then use ALR lookup to allow ALR learning on CPU port.

 * Otherwise transmit directly to port with STP state override.

 * See also: lan9303_separate_ports() and lan9303.pdf 6.4.10.1
@@ -55,7 +54,7 @@ static int lan9303_xmit_use_arl(struct dsa_port *dp, u8 *dest_addr) 
{

	struct lan9303 *chip = dp->ds->priv;



	return chip->is_bridged && !ether_addr_equal(dest_addr, eth_stp_addr);

	return chip->is_bridged && !is_multicast_ether_addr(dest_addr);

}



static struct sk_buff *lan9303_xmit(struct sk_buff *skb, struct net_device *dev)
@@ -127,6 +126,8 @@ static struct sk_buff *lan9303_rcv(struct sk_buff *skb, struct net_device *dev, 
	skb_pull_rcsum(skb, 2 + 2);

	memmove(skb->data - ETH_HLEN, skb->data - (ETH_HLEN + LAN9303_TAG_LEN),

		2 * ETH_ALEN);

	skb->offload_fwd_mark = !ether_addr_equal(skb->data - ETH_HLEN,

						  eth_stp_addr);



	return skb;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE