* [PATCH net] net: dsa: microchip: add switch offload forwarding support
@ 2019-02-08 4:05 Tristram.Ha
2019-02-11 20:49 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Tristram.Ha @ 2019-02-08 4:05 UTC (permalink / raw)
To: David S. Miller, Sergio Paracuellos
Cc: Tristram Ha, Andrew Lunn, Florian Fainelli, Pavel Machek,
UNGLinuxDriver, netdev
From: Tristram Ha <Tristram.Ha@microchip.com>
The flag offload_fwd_mark is set as the switch can forward frames by
itself.
This can be considered a fix to a problem introduced in commit
c2e866911e254067 where the port membership are not set in sync. The flag
offload_fwd_mark just needs to be set in tag_ksz.c to prevent the software
bridge from forwarding duplicate multicast frames.
Fixes: c2e866911e254067 ("microchip: break KSZ9477 DSA driver into two files")
Signed-off-by: Tristram Ha <Tristram.Ha@microchip.com>
---
drivers/net/dsa/microchip/ksz9477.c | 7 ++++---
net/dsa/tag_ksz.c | 2 ++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index 89ed059..674d77e 100644
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -397,6 +397,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);
@@ -464,10 +465,10 @@ static void ksz9477_port_stp_state_set(struct dsa_switch *ds, int port,
}
/* When topology has changed the function ksz_update_port_member
- * should be called to modify port forwarding behavior. However
- * as the offload_fwd_mark indication cannot be reported here
- * the switch forwarding function is not enabled.
+ * should be called to modify port forwarding behavior.
*/
+ 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 da71b9e..927e9c8 100644
--- a/net/dsa/tag_ksz.c
+++ b/net/dsa/tag_ksz.c
@@ -67,6 +67,8 @@ static struct sk_buff *ksz_common_rcv(struct sk_buff *skb,
pskb_trim_rcsum(skb, skb->len - len);
+ skb->offload_fwd_mark = true;
+
return skb;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] net: dsa: microchip: add switch offload forwarding support
2019-02-08 4:05 [PATCH net] net: dsa: microchip: add switch offload forwarding support Tristram.Ha
@ 2019-02-11 20:49 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2019-02-11 20:49 UTC (permalink / raw)
To: Tristram.Ha
Cc: sergio.paracuellos, andrew, f.fainelli, pavel, UNGLinuxDriver, netdev
From: <Tristram.Ha@microchip.com>
Date: Thu, 7 Feb 2019 20:05:58 -0800
> From: Tristram Ha <Tristram.Ha@microchip.com>
>
> The flag offload_fwd_mark is set as the switch can forward frames by
> itself.
>
> This can be considered a fix to a problem introduced in commit
> c2e866911e254067 where the port membership are not set in sync. The flag
> offload_fwd_mark just needs to be set in tag_ksz.c to prevent the software
> bridge from forwarding duplicate multicast frames.
>
> Fixes: c2e866911e254067 ("microchip: break KSZ9477 DSA driver into two files")
> Signed-off-by: Tristram Ha <Tristram.Ha@microchip.com>
Applied, thank you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-02-11 20:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-08 4:05 [PATCH net] net: dsa: microchip: add switch offload forwarding support Tristram.Ha
2019-02-11 20:49 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).