From: Greg Kroah-Hartman Date: Mon, 15 Oct 2012 20:26:24 +0000 (-0700) Subject: 3.0-stable patches X-Git-Tag: v3.0.47~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7da192413bdff0ff41c87487cc29ac4a5df985a;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: tg3-apply-short-dma-frag-workaround-to-5906.patch --- diff --git a/queue-3.0/series b/queue-3.0/series index fa9b571cfb0..44d8cad4eae 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -16,3 +16,4 @@ video-udlfb-fix-line-counting-in-fb_write.patch viafb-don-t-touch-clock-state-on-olpc-xo-1.5.patch timers-fix-endless-looping-between-cascade-and-internal_add_timer.patch pktgen-fix-crash-when-generating-ipv6-packets.patch +tg3-apply-short-dma-frag-workaround-to-5906.patch diff --git a/queue-3.0/tg3-apply-short-dma-frag-workaround-to-5906.patch b/queue-3.0/tg3-apply-short-dma-frag-workaround-to-5906.patch new file mode 100644 index 00000000000..38d8c92fb5b --- /dev/null +++ b/queue-3.0/tg3-apply-short-dma-frag-workaround-to-5906.patch @@ -0,0 +1,35 @@ +From b7abee6ef888117f92db370620ebf116a38e3f4d Mon Sep 17 00:00:00 2001 +From: Matt Carlson +Date: Thu, 7 Jun 2012 12:56:54 +0000 +Subject: tg3: Apply short DMA frag workaround to 5906 + +From: Matt Carlson + +commit b7abee6ef888117f92db370620ebf116a38e3f4d upstream. + +5906 devices also need the short DMA fragment workaround. This patch +makes the necessary change. + +Signed-off-by: Matt Carlson +Tested-by: Christian Kujau +Signed-off-by: David S. Miller +Signed-off-by: Mike Pagano + +--- + drivers/net/tg3.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/drivers/net/tg3.c ++++ b/drivers/net/tg3.c +@@ -13689,8 +13689,9 @@ static int __devinit tg3_get_invariants( + */ + tg3_flag_set(tp, 4G_DMA_BNDRY_BUG); + +- if (tg3_flag(tp, 5755_PLUS)) +- tg3_flag_set(tp, SHORT_DMA_BUG); ++ if (tg3_flag(tp, 5755_PLUS) || ++ GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) ++ tg3_flag_set(tp, SHORT_DMA_BUG); + else + tg3_flag_set(tp, 40BIT_DMA_LIMIT_BUG); +