diff options
| author | Matt Carlson <mcarlson@broadcom.com> | 2011-06-13 13:38:57 +0000 |
|---|---|---|
| committer | David S. Miller <davem@conan.davemloft.net> | 2011-06-15 11:11:56 -0400 |
| commit | eb69d564a3f34df602bd9b0fae94e14fad23de2d (patch) | |
| tree | ce22bf484f81be4da43aa82324cad7c6b7fa2bf8 /drivers | |
| parent | daf9a55387df8f429d1219bbdabba1ab33d2a479 (diff) | |
| download | linux-eb69d564a3f34df602bd9b0fae94e14fad23de2d.tar.gz linux-eb69d564a3f34df602bd9b0fae94e14fad23de2d.tar.bz2 linux-eb69d564a3f34df602bd9b0fae94e14fad23de2d.zip | |
tg3: Remove 4G_DMA_BNDRY_BUG flag
Now that all chips have this bug, the flag checks become useless code.
This patch removes the flag.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Reviewed-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: David S. Miller <davem@conan.davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/tg3.c | 14 | ||||
| -rw-r--r-- | drivers/net/tg3.h | 1 |
2 files changed, 3 insertions, 12 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index c4f193eba82d..8483664b9cee 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -5822,8 +5822,7 @@ static int tigon3_dma_hwbug_workaround(struct tg3_napi *tnapi, /* Make sure new skb does not cross any 4G boundaries. * Drop the packet if it does. */ - } else if (tg3_flag(tp, 4G_DMA_BNDRY_BUG) && - tg3_4g_overflow_test(new_addr, new_skb->len)) { + } else if (tg3_4g_overflow_test(new_addr, new_skb->len)) { pci_unmap_single(tp->pdev, new_addr, new_skb->len, PCI_DMA_TODEVICE); ret = -1; @@ -6018,8 +6017,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) if (tg3_flag(tp, SHORT_DMA_BUG) && len <= 8) would_hit_hwbug = 1; - if (tg3_flag(tp, 4G_DMA_BNDRY_BUG) && - tg3_4g_overflow_test(mapping, len)) + if (tg3_4g_overflow_test(mapping, len)) would_hit_hwbug = 1; if (tg3_40bit_overflow_test(tp, mapping, len)) @@ -6055,8 +6053,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) len <= 8) would_hit_hwbug = 1; - if (tg3_flag(tp, 4G_DMA_BNDRY_BUG) && - tg3_4g_overflow_test(mapping, len)) + if (tg3_4g_overflow_test(mapping, len)) would_hit_hwbug = 1; if (tg3_40bit_overflow_test(tp, mapping, len)) @@ -13703,11 +13700,6 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) } } - /* All chips can get confused if TX buffers - * straddle the 4GB address boundary. - */ - tg3_flag_set(tp, 4G_DMA_BNDRY_BUG); - if (tg3_flag(tp, 5755_PLUS)) tg3_flag_set(tp, SHORT_DMA_BUG); diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index 4f5dbf6adfe2..fc33566b9f9c 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h @@ -2896,7 +2896,6 @@ enum TG3_FLAGS { TG3_FLAG_NO_NVRAM, TG3_FLAG_ENABLE_RSS, TG3_FLAG_ENABLE_TSS, - TG3_FLAG_4G_DMA_BNDRY_BUG, TG3_FLAG_SHORT_DMA_BUG, TG3_FLAG_USE_JUMBO_BDFLAG, TG3_FLAG_L1PLLPD_EN, |