delete queue-3.4/tg3-fix-data-corruption-on-5725-with-tso.patch

diff --git a/queue-3.4/series b/queue-3.4/series
index 790f22198a89d165adc3b7f530596d89bd6fb85f..f82b9d8121e4978601329ba2e905c556c7ce8c59 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -12,7 +12,6 @@ usb-xhci-override-bogus-bulk-wmaxpacketsize-values.patch
 usb-uhci-fix-for-suspend-of-virtual-hp-controller.patch
 cifs-only-set-ops-for-inodes-in-i_new-state.patch
 fat-fix-possible-overflow-for-fat_clusters.patch
-tg3-fix-data-corruption-on-5725-with-tso.patch
 perf-net_dropmonitor-fix-trace-parameter-order.patch
 perf-net_dropmonitor-fix-symbol-relative-addresses.patch
 ocfs2-goto-out_unlock-if-ocfs2_get_clusters_nocache-failed-in-ocfs2_fiemap.patch

diff --git a/queue-3.4/tg3-fix-data-corruption-on-5725-with-tso.patch b/queue-3.4/tg3-fix-data-corruption-on-5725-with-tso.patch
deleted file mode 100644 (file)
index 3baf50c..0000000
--- a/queue-3.4/tg3-fix-data-corruption-on-5725-with-tso.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 0f0d15100a8ac875bdd408324c473e16d73d3557 Mon Sep 17 00:00:00 2001
-From: Michael Chan <mchan@broadcom.com>
-Date: Mon, 13 May 2013 11:04:16 +0000
-Subject: tg3: Fix data corruption on 5725 with TSO
-
-From: Michael Chan <mchan@broadcom.com>
-
-commit 0f0d15100a8ac875bdd408324c473e16d73d3557 upstream.
-
-The 5725 family of devices (asic rev 5762), corrupts TSO packets where
-the buffer is within MSS bytes of a 4G boundary (4G, 8G etc.). Detect
-this condition and trigger the workaround path.
-
-Signed-off-by: Michael Chan <mchan@broadcom.com>
-Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/net/ethernet/broadcom/tg3.c |   17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
---- a/drivers/net/ethernet/broadcom/tg3.c
-+++ b/drivers/net/ethernet/broadcom/tg3.c
-@@ -6622,6 +6622,20 @@ static inline int tg3_4g_overflow_test(d
-       return (base > 0xffffdcc0) && (base + len + 8 < base);
- }
- 
-+/* Test for TSO DMA buffers that cross into regions which are within MSS bytes
-+ * of any 4GB boundaries: 4G, 8G, etc
-+ */
-+static inline int tg3_4g_tso_overflow_test(struct tg3 *tp, dma_addr_t mapping,
-+                                         u32 len, u32 mss)
-+{
-+      if (tg3_asic_rev(tp) == ASIC_REV_5762 && mss) {
-+              u32 base = (u32) mapping & 0xffffffff;
-+
-+              return ((base + len + (mss & 0x3fff)) < base);
-+      }
-+      return 0;
-+}
-+
- /* Test for DMA addresses > 40-bit */
- static inline int tg3_40bit_overflow_test(struct tg3 *tp, dma_addr_t mapping,
-                                         int len)
-@@ -6658,6 +6672,9 @@ static bool tg3_tx_frag_set(struct tg3_n
-       if (tg3_4g_overflow_test(map, len))
-               hwbug = true;
- 
-+      if (tg3_4g_tso_overflow_test(tp, map, len, mss))
-+              hwbug = true;
-+
-       if (tg3_40bit_overflow_test(tp, map, len))
-               hwbug = true;
-