The patch titled
ixgb: fix tx unit hang - properly calculate desciptor count
has been added to the -mm tree. Its filename is
ixgb-fix-tx-unit-hang-properly-calculate-desciptor-count.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ixgb: fix tx unit hang - properly calculate desciptor count
From: Auke Kok <auke-jan.h.kok@xxxxxxxxx>
There were some tso bugs that only showed up with heavy load and 16kB pages
that this patch fixes by making the driver's internal use count of
descriptors match the count that it was estimating it needed using the
DESC_NEEDED macro. This bug caused NETDEV_WATCHDOG resets aka tx timeouts.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@xxxxxxxxx>
Signed-off-by: Auke Kok <auke-jan.h.kok@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/ixgb/ixgb_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/net/ixgb/ixgb_main.c~ixgb-fix-tx-unit-hang-properly-calculate-desciptor-count drivers/net/ixgb/ixgb_main.c
--- a/drivers/net/ixgb/ixgb_main.c~ixgb-fix-tx-unit-hang-properly-calculate-desciptor-count
+++ a/drivers/net/ixgb/ixgb_main.c
@@ -1292,7 +1292,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter
while(len) {
buffer_info = &tx_ring->buffer_info[i];
- size = min(len, IXGB_MAX_JUMBO_FRAME_SIZE);
+ size = min(len, IXGB_MAX_DATA_PER_TXD);
buffer_info->length = size;
buffer_info->dma =
pci_map_single(adapter->pdev,
@@ -1317,7 +1317,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter
while(len) {
buffer_info = &tx_ring->buffer_info[i];
- size = min(len, IXGB_MAX_JUMBO_FRAME_SIZE);
+ size = min(len, IXGB_MAX_DATA_PER_TXD);
buffer_info->length = size;
buffer_info->dma =
pci_map_page(adapter->pdev,
_
Patches currently in -mm which might be from auke-jan.h.kok@xxxxxxxxx are
origin.patch
e1000-irq-naming-update.patch
ixgb-add-pci-error-recovery-callbacks.patch
drivers-net-e1000-possible-cleanups.patch
e1000_7033_dump_ring.patch
ixgb-fix-tx-unit-hang-properly-calculate-desciptor-count.patch
e100-disable-device-on-pci-error.patch
e1000-disable-device-on-pci-error.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
