aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
authorJesse Brandeburg <jesse.brandeburg@intel.com>2006-10-24 17:46:04 -0400
committerAuke Kok <juke-jan.h.kok@intel.com>2006-10-24 17:46:04 -0400
commit032fe6e9e253ebb37a0df0893844674dea9210fd (patch)
treeb3f7fec86b8e72280f774191739d21e2627740df /drivers/net/e1000
parente64d7d02090e475cfd7efbc830146d0c6dd579bc (diff)
e1000: FIX: Don't limit descriptor size to 4kb for PCI-E adapters
82571 and newer chispets don't need to limit desc. length to 4kb and can handle 8kb sizes. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r--drivers/net/e1000/e1000_main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 7362e1240178..e75909ee6d85 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2992,6 +2992,11 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
2992 return NETDEV_TX_OK; 2992 return NETDEV_TX_OK;
2993 } 2993 }
2994 2994
2995 /* 82571 and newer doesn't need the workaround that limited descriptor
2996 * length to 4kB */
2997 if (adapter->hw.mac_type >= e1000_82571)
2998 max_per_txd = 8192;
2999
2995#ifdef NETIF_F_TSO 3000#ifdef NETIF_F_TSO
2996 mss = skb_shinfo(skb)->gso_size; 3001 mss = skb_shinfo(skb)->gso_size;
2997 /* The controller does a simple calculation to 3002 /* The controller does a simple calculation to