Home Home > GIT Browse > openSUSE-15.1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tbogendoerfer@suse.de>2019-06-07 13:27:44 +0200
committerThomas Bogendoerfer <tbogendoerfer@suse.de>2019-06-07 13:30:49 +0200
commit64d2da57edfa8d76ab7f44f537d9786d7e6d8217 (patch)
treed3ec5201e0bd4a8953a36ad445bcb0fd9e72a2dc
parent71d67b9e3f17d8fefc3c421544001ec23f5fec95 (diff)
net: hns3: fix for HNS3_RXD_GRO_SIZE_M macro (bsc#1104353
FATE#326415 bsc#1137201).
-rw-r--r--patches.drivers/net-hns3-fix-for-HNS3_RXD_GRO_SIZE_M-macro.patch32
-rw-r--r--series.conf1
2 files changed, 33 insertions, 0 deletions
diff --git a/patches.drivers/net-hns3-fix-for-HNS3_RXD_GRO_SIZE_M-macro.patch b/patches.drivers/net-hns3-fix-for-HNS3_RXD_GRO_SIZE_M-macro.patch
new file mode 100644
index 0000000000..3ac384017d
--- /dev/null
+++ b/patches.drivers/net-hns3-fix-for-HNS3_RXD_GRO_SIZE_M-macro.patch
@@ -0,0 +1,32 @@
+From: Yunsheng Lin <linyunsheng@huawei.com>
+Date: Tue, 28 May 2019 17:02:52 +0800
+Subject: net: hns3: fix for HNS3_RXD_GRO_SIZE_M macro
+Patch-mainline: Queued in subsystem maintainer repository
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
+Git-commit: eff858c178fcc513e620bb803b4e3bfb9727856c
+References: bsc#1104353 FATE#326415 bsc#1137201
+
+According to hardware user menual, the GRO_SIZE is 14 bits width,
+the HNS3_RXD_GRO_SIZE_M is 10 bits width now, which may cause
+hardware GRO received packet error problem.
+
+Fixes: a6d53b97a2e7 ("net: hns3: Adds GRO params to SKB for the stack")
+Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
+Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
+---
+ drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
++++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
+@@ -145,7 +145,7 @@ enum hns3_nic_state {
+ #define HNS3_RXD_TSIND_M (0x7 << HNS3_RXD_TSIND_S)
+ #define HNS3_RXD_LKBK_B 15
+ #define HNS3_RXD_GRO_SIZE_S 16
+-#define HNS3_RXD_GRO_SIZE_M (0x3ff << HNS3_RXD_GRO_SIZE_S)
++#define HNS3_RXD_GRO_SIZE_M (0x3fff << HNS3_RXD_GRO_SIZE_S)
+
+ #define HNS3_TXD_L3T_S 0
+ #define HNS3_TXD_L3T_M (0x3 << HNS3_TXD_L3T_S)
diff --git a/series.conf b/series.conf
index 5cba25bab8..53ecc4ff48 100644
--- a/series.conf
+++ b/series.conf
@@ -46776,6 +46776,7 @@
patches.drivers/qed-Set-the-doorbell-address-correctly.patch
patches.drivers/qed-Add-qed-devlink-parameters-table.patch
patches.drivers/qed-Add-iWARP-100g-support.patch
+ patches.drivers/net-hns3-fix-for-HNS3_RXD_GRO_SIZE_M-macro.patch
patches.drivers/qed-Reduce-the-severity-of-ptp-debug-message.patch
patches.drivers/qede-Handle-infinite-driver-spinning-for-Tx-timestam.patch
patches.drivers/qed-fix-spelling-mistake-inculde-include.patch