Skip to contentSkip to conversation

ixgb: fix tx unit hang - properly calculate desciptor count

PATCH New Auke Kok 1 participant 1 message Jul 10, 2006

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Auke Kok

author
#0 lore raw

PATCH 1/1 ixgb: fix tx unit hang - properly calculate desciptor count

Jeff,

Please apply to #upstream-fixes.

Cheers,

Auke

---

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 <[email protected]>
Signed-off-by Auke Kok <[email protected]>

---

 drivers/net/ixgb/ixgb_main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ixgb/ixgb_main.c +2 -2
index b91e082..846e11b 100644
@@ -1281,7 +1281,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,

@@ -1306,7 +1306,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,