Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tbogendoerfer@suse.de>2019-11-05 14:08:48 +0100
committerThomas Bogendoerfer <tbogendoerfer@suse.de>2019-11-05 14:10:00 +0100
commit08a520cb3a576302d5e9bf66287679ee7b48cc9a (patch)
tree2b87a9d5bfbbf553577be320c6129a3f09f65faa
parenta3809eface9b801b18e5031f2e1f53cdfb1cfb25 (diff)
ixgbe: Remove duplicate clear_bit() call (jsc#SLE-7979
jsc#SLE-7981).
-rw-r--r--patches.suse/ixgbe-Remove-duplicate-clear_bit-call.patch27
-rw-r--r--series.conf1
2 files changed, 28 insertions, 0 deletions
diff --git a/patches.suse/ixgbe-Remove-duplicate-clear_bit-call.patch b/patches.suse/ixgbe-Remove-duplicate-clear_bit-call.patch
new file mode 100644
index 0000000000..218c79a454
--- /dev/null
+++ b/patches.suse/ixgbe-Remove-duplicate-clear_bit-call.patch
@@ -0,0 +1,27 @@
+From: Igor Pylypiv <igor.pylypiv@gmail.com>
+Date: Thu, 3 Oct 2019 23:53:57 -0700
+Subject: ixgbe: Remove duplicate clear_bit() call
+Patch-mainline: v5.4-rc6
+Git-commit: 451fe015b2857de3d8027ef606284a205e177724
+References: jsc#SLE-7979 jsc#SLE-7981
+
+__IXGBE_RX_BUILD_SKB_ENABLED bit is already cleared.
+
+Signed-off-by: Igor Pylypiv <igor.pylypiv@gmail.com>
+Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
+---
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
++++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+@@ -4310,7 +4310,6 @@ static void ixgbe_set_rx_buffer_len(stru
+ if (test_bit(__IXGBE_RX_FCOE, &rx_ring->state))
+ set_bit(__IXGBE_RX_3K_BUFFER, &rx_ring->state);
+
+- clear_bit(__IXGBE_RX_BUILD_SKB_ENABLED, &rx_ring->state);
+ if (adapter->flags2 & IXGBE_FLAG2_RX_LEGACY)
+ continue;
+
diff --git a/series.conf b/series.conf
index becf0a163b..07afab894b 100644
--- a/series.conf
+++ b/series.conf
@@ -2895,6 +2895,7 @@
patches.suse/igb-Fix-constant-media-auto-sense-switching-when-no-.patch
patches.suse/i40e-Fix-receive-buffer-starvation-for-AF_XDP.patch
patches.suse/e1000-fix-memory-leaks.patch
+ patches.suse/ixgbe-Remove-duplicate-clear_bit-call.patch
patches.suse/powerpc-powernv-Fix-CPU-idle-to-be-called-with-IRQs-.patch
patches.suse/scsi-qla2xxx-fixup-incorrect-usage-of-host_byte.patch
patches.suse/scsi-lpfc-Check-queue-pointer-before-use.patch