remove queue-3.4/tg3-expand-4g_overflow_test-workaround-to-skb-fragments-of-any-size...

diff --git a/queue-3.4/series b/queue-3.4/series
index a2f68d0418f385df8ce0d708769a2dd9d784b862..c46da1e346d6a34849c457df4a1ab2941ac4e62b 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -19,7 +19,6 @@ net_dma-mark-broken.patch
 drm-radeon-fix-asic-gfx-values-for-scrapper-asics.patch
 drm-radeon-0x9649-is-sumo2-not-sumo.patch
 ceph-avoid-data-inconsistency-due-to-d-cache-aliasing-in-readpage.patch
-tg3-expand-4g_overflow_test-workaround-to-skb-fragments-of-any-size.patch
 dm9601-fix-reception-of-full-size-ethernet-frames-on-dm9620-dm9621a.patch
 dm9601-work-around-tx-fifo-sync-issue-on-dm962x.patch
 ath9k-fix-interrupt-handling-for-the-ar9002-family.patch

diff --git a/queue-3.4/tg3-expand-4g_overflow_test-workaround-to-skb-fragments-of-any-size.patch b/queue-3.4/tg3-expand-4g_overflow_test-workaround-to-skb-fragments-of-any-size.patch
deleted file mode 100644 (file)
index 9a4f0c8..0000000
--- a/queue-3.4/tg3-expand-4g_overflow_test-workaround-to-skb-fragments-of-any-size.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 375679104ab3ccfd18dcbd7ba503734fb9a2c63a Mon Sep 17 00:00:00 2001
-From: Nithin Sujir <nsujir@broadcom.com>
-Date: Thu, 19 Dec 2013 17:44:11 -0800
-Subject: tg3: Expand 4g_overflow_test workaround to skb fragments of any size.
-
-From: Nithin Sujir <nsujir@broadcom.com>
-
-commit 375679104ab3ccfd18dcbd7ba503734fb9a2c63a upstream.
-
-The current driver assumes that an skb fragment can only be upto jumbo
-size. Presumably this was a fast-path optimization. This assumption is
-no longer true as fragments can be upto 32k.
-
-v2: Remove unnecessary parantheses per Eric Dumazet.
-
-Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com>
-Signed-off-by: Michael Chan <mchan@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 |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/ethernet/broadcom/tg3.c
-+++ b/drivers/net/ethernet/broadcom/tg3.c
-@@ -6619,7 +6619,7 @@ static inline int tg3_4g_overflow_test(d
- {
-       u32 base = (u32) mapping & 0xffffffff;
- 
--      return (base > 0xffffdcc0) && (base + len + 8 < base);
-+      return base + len + 8 < base;
- }
- 
- /* Test for DMA addresses > 40-bit */