4.9-stable patches

added patches:
	net-dsa-tag_brcm-fix-skb-fwd_offload_mark-location.patch

diff --git a/queue-4.9/net-dsa-tag_brcm-fix-skb-fwd_offload_mark-location.patch b/queue-4.9/net-dsa-tag_brcm-fix-skb-fwd_offload_mark-location.patch
new file mode 100644 (file)
index 0000000..f254273
--- /dev/null
+++ b/queue-4.9/net-dsa-tag_brcm-fix-skb-fwd_offload_mark-location.patch
@@ -0,0 +1,44 @@
+From f.fainelli@gmail.com  Tue Apr  7 07:42:34 2020
+From: Florian Fainelli <f.fainelli@gmail.com>
+Date: Mon,  6 Apr 2020 17:54:12 -0700
+Subject: net: dsa: tag_brcm: Fix skb->fwd_offload_mark location
+To: linux-stable@vger.kernel.org
+Cc: gregkh@linuxfoundation.org, sashal@kernel.org, Florian Fainelli <f.fainelli@gmail.com>, Andrew Lunn <andrew@lunn.ch>, Vivien Didelot <vivien.didelot@savoirfairelinux.com>, "David S. Miller" <davem@davemloft.net>, netdev@vger.kernel.org (open list:NETWORKING [GENERAL]), linux-kernel@vger.kernel.org (open list)
+Message-ID: <1586220853-34769-1-git-send-email-f.fainelli@gmail.com>
+
+From: Florian Fainelli <f.fainelli@gmail.com>
+
+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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/dsa/tag_brcm.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/net/dsa/tag_brcm.c
++++ b/net/dsa/tag_brcm.c
+@@ -84,8 +84,6 @@ static struct sk_buff *brcm_tag_xmit(str
+               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->dev->stats.rx_packets++;
+       skb->dev->stats.rx_bytes += skb->len;
+ 
++      skb->offload_fwd_mark = 1;
++
+       netif_receive_skb(skb);
+ 
+       return 0;

diff --git a/queue-4.9/series b/queue-4.9/series
index f8661a56d547acb091d79476aee32a7672db4769..4e67c8fe941c99bcf346a8d453776398e34c06dc 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -9,3 +9,4 @@ drm-etnaviv-replace-mmu-flush-marker-with-flush-sequence.patch
 blk-mq-sync-the-update-nr_hw_queues-with-blk_mq_queue_tag_busy_iter.patch
 blk-mq-allow-blocking-queue-tag-iter-callbacks.patch
 coresight-do-not-use-the-bit-macro-in-the-uapi-header.patch
+net-dsa-tag_brcm-fix-skb-fwd_offload_mark-location.patch