From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 8 May 2019 06:35:38 +0000 (+0200)
Subject: 4.19-stable patches
X-Git-Tag: v4.9.175~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ddfde33feed37942ee0cb20bbd77c13a65c8a5aa;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

added patches:
	net-stmmac-use-bfsize1-in-ndesc_init_rx_desc.patch
---

diff --git a/queue-4.19/net-stmmac-use-bfsize1-in-ndesc_init_rx_desc.patch b/queue-4.19/net-stmmac-use-bfsize1-in-ndesc_init_rx_desc.patch
new file mode 100644
index 00000000000..5326041e149
--- /dev/null
+++ b/queue-4.19/net-stmmac-use-bfsize1-in-ndesc_init_rx_desc.patch
@@ -0,0 +1,39 @@
+From f87db4dbd52f2f8a170a2b51cb0926221ca7c9e2 Mon Sep 17 00:00:00 2001
+From: YueHaibing <yuehaibing@huawei.com>
+Date: Wed, 17 Apr 2019 09:49:39 +0800
+Subject: net: stmmac: Use bfsize1 in ndesc_init_rx_desc
+
+From: YueHaibing <yuehaibing@huawei.com>
+
+commit f87db4dbd52f2f8a170a2b51cb0926221ca7c9e2 upstream.
+
+gcc warn this:
+
+drivers/net/ethernet/stmicro/stmmac/norm_desc.c: In function ndesc_init_rx_desc:
+drivers/net/ethernet/stmicro/stmmac/norm_desc.c:138:6: warning: variable 'bfsize1' set but not used [-Wunused-but-set-variable]
+
+Like enh_desc_init_rx_desc, we should use bfsize1
+in ndesc_init_rx_desc to calculate 'p->des1'
+
+Fixes: 583e63614149 ("net: stmmac: use correct DMA buffer size in the RX descriptor")
+Signed-off-by: YueHaibing <yuehaibing@huawei.com>
+Reviewed-by: Aaro Koskinen <aaro.koskinen@nokia.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Cc: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/ethernet/stmicro/stmmac/norm_desc.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
++++ b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
+@@ -140,7 +140,7 @@ static void ndesc_init_rx_desc(struct dm
+ 	p->des0 |= cpu_to_le32(RDES0_OWN);
+ 
+ 	bfsize1 = min(bfsize, BUF_SIZE_2KiB - 1);
+-	p->des1 |= cpu_to_le32(bfsize & RDES1_BUFFER1_SIZE_MASK);
++	p->des1 |= cpu_to_le32(bfsize1 & RDES1_BUFFER1_SIZE_MASK);
+ 
+ 	if (mode == STMMAC_CHAIN_MODE)
+ 		ndesc_rx_set_on_chain(p, end);
diff --git a/queue-4.19/series b/queue-4.19/series
new file mode 100644
index 00000000000..01adfa8b1b6
--- /dev/null
+++ b/queue-4.19/series
@@ -0,0 +1 @@
+net-stmmac-use-bfsize1-in-ndesc_init_rx_desc.patch
diff --git a/queue-5.0/series b/queue-5.0/series
new file mode 100644
index 00000000000..01adfa8b1b6
--- /dev/null
+++ b/queue-5.0/series
@@ -0,0 +1 @@
+net-stmmac-use-bfsize1-in-ndesc_init_rx_desc.patch