diff mbox series

[v3,net-next,11/11] net: dsa: microchip: Add switch offload forwarding support

Message ID 1540261575-1889-12-git-send-email-Tristram.Ha@microchip.com
State Changes Requested, archived
Delegated to: David Miller
Headers show
Series net: dsa: microchip: Modify KSZ9477 DSA driver in preparation to add other KSZ switch drivers | expand

Commit Message

Tristram.Ha@microchip.com Oct. 23, 2018, 2:26 a.m. UTC 
From: Tristram Ha <Tristram.Ha@microchip.com>

Add switch offload forwarding support.

Signed-off-by: Tristram Ha <Tristram.Ha@microchip.com>
---
 drivers/net/dsa/microchip/ksz9477.c | 3 +++
 net/dsa/tag_ksz.c                   | 2 ++
 2 files changed, 5 insertions(+)
diff mbox series

Patch

diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index c399fa2..f7d0bbe 100644
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -438,6 +438,7 @@  static void ksz9477_port_stp_state_set(struct dsa_switch *ds, int port,
 	struct ksz_port *p = &dev->ports[port];
 	u8 data;
 	int member = -1;
+	int forward = dev->member;
 
 	ksz_pread8(dev, port, P_STP_CTRL, &data);
 	data &= ~(PORT_TX_ENABLE | PORT_RX_ENABLE | PORT_LEARN_DISABLE);
@@ -509,6 +510,8 @@  static void ksz9477_port_stp_state_set(struct dsa_switch *ds, int port,
 	 * as the offload_fwd_mark indication cannot be reported here
 	 * the switch forwarding function is not enabled.
 	 */
+	if (forward != dev->member)
+		ksz_update_port_member(dev, port);
 }
 
 static void ksz9477_flush_dyn_mac_table(struct ksz_device *dev, int port)
diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c
index e2c5dd4..47a3b91 100644
--- a/net/dsa/tag_ksz.c
+++ b/net/dsa/tag_ksz.c
@@ -84,6 +84,8 @@  static struct sk_buff *ksz_rcv(struct sk_buff *skb, struct net_device *dev,
 
 	pskb_trim_rcsum(skb, skb->len - len);
 
+	skb->offload_fwd_mark = 1;
+
 	return skb;
 }