Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tbogendoerfer@suse.de>2019-05-24 13:44:41 +0200
committerThomas Bogendoerfer <tbogendoerfer@suse.de>2019-05-24 13:44:57 +0200
commit1a64be3d4ec7f40f4fd339608040f81949d9fb42 (patch)
tree3ba5cdaf751540f630cb1c1c2c3f1579c0fad932
parente71603419e8480dc88512b72940008bd0c009298 (diff)
net: ena: fix return value of ena_com_config_llq_info()SLE15
(bsc#1111696 bsc#1117561).
-rw-r--r--patches.drivers/net-ena-fix-return-value-of-ena_com_config_llq_info.patch31
-rw-r--r--series.conf1
2 files changed, 32 insertions, 0 deletions
diff --git a/patches.drivers/net-ena-fix-return-value-of-ena_com_config_llq_info.patch b/patches.drivers/net-ena-fix-return-value-of-ena_com_config_llq_info.patch
new file mode 100644
index 0000000000..bdfc085781
--- /dev/null
+++ b/patches.drivers/net-ena-fix-return-value-of-ena_com_config_llq_info.patch
@@ -0,0 +1,31 @@
+From: Sameeh Jubran <sameehj@amazon.com>
+Date: Wed, 1 May 2019 16:47:07 +0300
+Subject: net: ena: fix return value of ena_com_config_llq_info()
+Patch-mainline: v5.2-rc1
+Git-commit: 9a27de0c6ba10fe1af74d16d3524425e52c1ba3e
+References: bsc#1111696 bsc#1117561
+
+ena_com_config_llq_info() returns 0 even if ena_com_set_llq() fails.
+Return the failure code of ena_com_set_llq() in case it fails.
+
+fixes: 689b2bdaaa14 ("net: ena: add functions for handling Low Latency Queues in ena_com")
+
+Signed-off-by: Arthur Kiyanovski <akiyano@amazon.com>
+Signed-off-by: Sameeh Jubran <sameehj@amazon.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
+---
+ drivers/net/ethernet/amazon/ena/ena_com.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/amazon/ena/ena_com.c
++++ b/drivers/net/ethernet/amazon/ena/ena_com.c
+@@ -731,7 +731,7 @@ static int ena_com_config_llq_info(struc
+ if (rc)
+ pr_err("Cannot set LLQ configuration: %d\n", rc);
+
+- return 0;
++ return rc;
+ }
+
+ static int ena_com_wait_and_process_admin_cq_interrupts(struct ena_comp_ctx *comp_ctx,
diff --git a/series.conf b/series.conf
index 798496359c..672115aef3 100644
--- a/series.conf
+++ b/series.conf
@@ -21992,6 +21992,7 @@
patches.drivers/mwl8k-Fix-rate_idx-underflow.patch
patches.drivers/rtlwifi-rtl8723ae-Fix-missing-break-in-switch-statem.patch
patches.drivers/brcm80211-potential-NULL-dereference-in-brcmf_cfg802.patch
+ patches.drivers/net-ena-fix-return-value-of-ena_com_config_llq_info.patch
patches.fixes/0001-dt-bindings-net-Fix-a-typo-in-the-phy-mode-list-for-.patch
patches.drivers/usb-storage-Set-virt_boundary_mask-to-avoid-SG-overf.patch
patches.drivers/USB-cdc-acm-fix-unthrottle-races.patch