diff options
| author | Matt Carlson <mcarlson@broadcom.com> | 2012-06-07 12:56:54 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-21 09:17:11 -0700 |
| commit | e5d5ba9f15c541fbc4aef3fb70ae69c4e24ae1f3 (patch) | |
| tree | 2af5575a46f5739d017784c9071793d30e24cc49 /drivers/net | |
| parent | dd81262194af3606f714c8b39c8eb35da8c78f00 (diff) | |
| download | kernel_samsung_smdk4412-e5d5ba9f15c541fbc4aef3fb70ae69c4e24ae1f3.zip kernel_samsung_smdk4412-e5d5ba9f15c541fbc4aef3fb70ae69c4e24ae1f3.tar.gz kernel_samsung_smdk4412-e5d5ba9f15c541fbc4aef3fb70ae69c4e24ae1f3.tar.bz2 | |
tg3: Apply short DMA frag workaround to 5906
commit b7abee6ef888117f92db370620ebf116a38e3f4d upstream.
5906 devices also need the short DMA fragment workaround. This patch
makes the necessary change.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Tested-by: Christian Kujau <lists@nerdbynature.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Mike Pagano <mpagano@gentoo.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/tg3.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 85931ca..10a99e4 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -13689,8 +13689,9 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) */ 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); |