| 1 |
Author: mpagano |
| 2 |
Date: 2010-02-19 14:34:24 +0000 (Fri, 19 Feb 2010) |
| 3 |
New Revision: 1678 |
| 4 |
|
| 5 |
Modified: |
| 6 |
genpatches-2.6/trunk/2.6.32/2400_5906-transmit-hang-fix.patch |
| 7 |
Log: |
| 8 |
Fix for 5906 transmit patch |
| 9 |
|
| 10 |
Modified: genpatches-2.6/trunk/2.6.32/2400_5906-transmit-hang-fix.patch |
| 11 |
=================================================================== |
| 12 |
--- genpatches-2.6/trunk/2.6.32/2400_5906-transmit-hang-fix.patch 2010-02-19 13:53:38 UTC (rev 1677) |
| 13 |
+++ genpatches-2.6/trunk/2.6.32/2400_5906-transmit-hang-fix.patch 2010-02-19 14:34:24 UTC (rev 1678) |
| 14 |
@@ -5,8 +5,8 @@ |
| 15 |
|
| 16 |
Signed-off-by: Mike Pagano <mpagano@g.o> |
| 17 |
--- |
| 18 |
---- a/drivers/net/tg3.c 2010-01-30 15:59:44.000000000 -0500 |
| 19 |
-+++ b/drivers/net/tg3.c 2010-02-13 10:16:16.000000000 -0500 |
| 20 |
+--- a/drivers/net/tg3.c 2010-02-02 11:09:54.000000000 -0500 |
| 21 |
++++ b/drivers/net/tg3.c 2010-02-17 12:54:08.000000000 -0500 |
| 22 |
@@ -5392,7 +5392,7 @@ static netdev_tx_t tg3_start_xmit_dma_bu |
| 23 |
mss = 0; |
| 24 |
if ((mss = skb_shinfo(skb)->gso_size) != 0) { |
| 25 |
@@ -50,7 +50,7 @@ |
| 26 |
if (tg3_4g_overflow_test(mapping, len)) |
| 27 |
would_hit_hwbug = 1; |
| 28 |
|
| 29 |
-@@ -12608,6 +12617,13 @@ static int __devinit tg3_get_invariants( |
| 30 |
+@@ -12608,6 +12617,9 @@ static int __devinit tg3_get_invariants( |
| 31 |
} |
| 32 |
} |
| 33 |
|
| 34 |
@@ -60,7 +60,7 @@ |
| 35 |
tp->irq_max = 1; |
| 36 |
|
| 37 |
#ifdef TG3_NAPI |
| 38 |
-@@ -13975,8 +13991,7 @@ static int __devinit tg3_init_one(struct |
| 39 |
+@@ -13975,8 +13987,7 @@ static int __devinit tg3_init_one(struct |
| 40 |
goto err_out_iounmap; |
| 41 |
} |
| 42 |
|
| 43 |
@@ -70,8 +70,8 @@ |
| 44 |
dev->netdev_ops = &tg3_netdev_ops; |
| 45 |
else |
| 46 |
dev->netdev_ops = &tg3_netdev_ops_dma_bug; |
| 47 |
---- a/drivers/net/tg3.h 2010-01-30 15:59:47.000000000 -0500 |
| 48 |
-+++ b/drivers/net/tg3.h 2010-01-31 14:02:59.000000000 -0500 |
| 49 |
+--- a/drivers/net/tg3.h 2010-02-17 12:44:57.000000000 -0500 |
| 50 |
++++ b/drivers/net/tg3.h 2010-02-17 12:46:02.000000000 -0500 |
| 51 |
@@ -2759,6 +2759,9 @@ struct tg3 { |
| 52 |
#define TG3_FLG3_TOGGLE_10_100_L1PLLPD 0x00008000 |
| 53 |
#define TG3_FLG3_PHY_IS_FET 0x00010000 |
Archives