* [PATCH stable-4.9.y]] net: dsa: tag_brcm: Fix skb->fwd_offload_mark location
@ 2020-04-07 0:54 Florian Fainelli
2020-04-07 5:43 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Florian Fainelli @ 2020-04-07 0:54 UTC (permalink / raw)
To: linux-stable
Cc: gregkh, sashal, Florian Fainelli, Andrew Lunn, Vivien Didelot,
David S. Miller, open list:NETWORKING [GENERAL], open list
When the backport of upstream commit
0e62f543bed03a64495bd2651d4fe1aa4bcb7fe5 ("net: dsa: Fix duplicate
frames flooded by learning") was done the assignment of
skb->fwd_offload_mark would land in brcm_tag_xmit() which is incorrect,
it should have been in brcm_tag_rcv().
Fixes: 5e845dc62f38 ("net: dsa: Fix duplicate frames flooded by learning")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
net/dsa/tag_brcm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/dsa/tag_brcm.c b/net/dsa/tag_brcm.c
index 76d55a80f3b9..98074338cd83 100644
--- a/net/dsa/tag_brcm.c
+++ b/net/dsa/tag_brcm.c
@@ -84,8 +84,6 @@ static struct sk_buff *brcm_tag_xmit(struct sk_buff *skb, struct net_device *dev
brcm_tag[2] = BRCM_IG_DSTMAP2_MASK;
brcm_tag[3] = (1 << p->port) & BRCM_IG_DSTMAP1_MASK;
- skb->offload_fwd_mark = 1;
-
return skb;
out_free:
@@ -148,6 +146,8 @@ static int brcm_tag_rcv(struct sk_buff *skb, struct net_device *dev,
skb->dev->stats.rx_packets++;
skb->dev->stats.rx_bytes += skb->len;
+ skb->offload_fwd_mark = 1;
+
netif_receive_skb(skb);
return 0;
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH stable-4.9.y]] net: dsa: tag_brcm: Fix skb->fwd_offload_mark location
2020-04-07 0:54 [PATCH stable-4.9.y]] net: dsa: tag_brcm: Fix skb->fwd_offload_mark location Florian Fainelli
@ 2020-04-07 5:43 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2020-04-07 5:43 UTC (permalink / raw)
To: Florian Fainelli
Cc: linux-stable, sashal, Andrew Lunn, Vivien Didelot,
David S. Miller, open list:NETWORKING [GENERAL], open list
On Mon, Apr 06, 2020 at 05:54:12PM -0700, Florian Fainelli wrote:
> When the backport of upstream commit
> 0e62f543bed03a64495bd2651d4fe1aa4bcb7fe5 ("net: dsa: Fix duplicate
> frames flooded by learning") was done the assignment of
> skb->fwd_offload_mark would land in brcm_tag_xmit() which is incorrect,
> it should have been in brcm_tag_rcv().
>
> Fixes: 5e845dc62f38 ("net: dsa: Fix duplicate frames flooded by learning")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
> net/dsa/tag_brcm.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-07 5:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-07 0:54 [PATCH stable-4.9.y]] net: dsa: tag_brcm: Fix skb->fwd_offload_mark location Florian Fainelli
2020-04-07 5:43 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox