From: Jesse Brandeburg Date: Tue, 24 Oct 2006 21:46:04 +0000 (-0700) Subject: e1000: FIX: Don't limit descriptor size to 4kb for PCI-E adapters X-Git-Tag: v2.6.19-rc4~77^2~3 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=032fe6e9e253ebb37a0df0893844674dea9210fd;p=~emulex%2Finfiniband.git 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 Signed-off-by: Auke Kok --- diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 7362e124017..e75909ee6d8 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) return NETDEV_TX_OK; } + /* 82571 and newer doesn't need the workaround that limited descriptor + * length to 4kB */ + if (adapter->hw.mac_type >= e1000_82571) + max_per_txd = 8192; + #ifdef NETIF_F_TSO mss = skb_shinfo(skb)->gso_size; /* The controller does a simple calculation to