From: Tristram Ha <tristram...@microchip.com>

The flag offload_fwd_mark is set as the switch can forward frames by
itself.

Signed-off-by: Tristram Ha <tristram...@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 c690c2b2..ca9199a 100644
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -434,6 +434,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);
@@ -501,10 +502,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 307e58b..50511c2 100644
--- a/net/dsa/tag_ksz.c
+++ b/net/dsa/tag_ksz.c
@@ -89,6 +89,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;
 }
 
-- 
1.9.1

Reply via email to