[PATCH] ixgb: fix tx unit hang - properly calculate desciptor count
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@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
c5d965caa1
commit
709cf0187d
1 changed files with 2 additions and 2 deletions
|
@ -1281,7 +1281,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,
|
||||||
|
|
||||||
while(len) {
|
while(len) {
|
||||||
buffer_info = &tx_ring->buffer_info[i];
|
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->length = size;
|
||||||
buffer_info->dma =
|
buffer_info->dma =
|
||||||
pci_map_single(adapter->pdev,
|
pci_map_single(adapter->pdev,
|
||||||
|
@ -1306,7 +1306,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,
|
||||||
|
|
||||||
while(len) {
|
while(len) {
|
||||||
buffer_info = &tx_ring->buffer_info[i];
|
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->length = size;
|
||||||
buffer_info->dma =
|
buffer_info->dma =
|
||||||
pci_map_page(adapter->pdev,
|
pci_map_page(adapter->pdev,
|
||||||
|
|
Reference in a new issue