projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge v5.14-rc3 into usb-next
[linux-2.6-microblaze.git]
/
drivers
/
net
/
ethernet
/
intel
/
igc
/
igc_main.c
diff --git
a/drivers/net/ethernet/intel/igc/igc_main.c
b/drivers/net/ethernet/intel/igc/igc_main.c
index
9532309
..
e29aadb
100644
(file)
--- a/
drivers/net/ethernet/intel/igc/igc_main.c
+++ b/
drivers/net/ethernet/intel/igc/igc_main.c
@@
-232,6
+232,8
@@
static void igc_clean_tx_ring(struct igc_ring *tx_ring)
igc_unmap_tx_buffer(tx_ring->dev, tx_buffer);
}
igc_unmap_tx_buffer(tx_ring->dev, tx_buffer);
}
+ tx_buffer->next_to_watch = NULL;
+
/* move us one more past the eop_desc for start of next pkt */
tx_buffer++;
i++;
/* move us one more past the eop_desc for start of next pkt */
tx_buffer++;
i++;
@@
-6054,6
+6056,7
@@
err_sw_init:
err_ioremap:
free_netdev(netdev);
err_alloc_etherdev:
err_ioremap:
free_netdev(netdev);
err_alloc_etherdev:
+ pci_disable_pcie_error_reporting(pdev);
pci_release_mem_regions(pdev);
err_pci_reg:
err_dma:
pci_release_mem_regions(pdev);
err_pci_reg:
err_dma: