diff options
Diffstat (limited to 'drivers/net/igb/igb_main.c')
-rw-r--r-- | drivers/net/igb/igb_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 23209bd4f401..43f489aba191 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -994,7 +994,7 @@ void igb_reset(struct igb_adapter *adapter) | |||
994 | /* the tx fifo also stores 16 bytes of information about the tx | 994 | /* the tx fifo also stores 16 bytes of information about the tx |
995 | * but don't include ethernet FCS because hardware appends it */ | 995 | * but don't include ethernet FCS because hardware appends it */ |
996 | min_tx_space = (adapter->max_frame_size + | 996 | min_tx_space = (adapter->max_frame_size + |
997 | sizeof(struct e1000_tx_desc) - | 997 | sizeof(union e1000_adv_tx_desc) - |
998 | ETH_FCS_LEN) * 2; | 998 | ETH_FCS_LEN) * 2; |
999 | min_tx_space = ALIGN(min_tx_space, 1024); | 999 | min_tx_space = ALIGN(min_tx_space, 1024); |
1000 | min_tx_space >>= 10; | 1000 | min_tx_space >>= 10; |
@@ -1704,7 +1704,7 @@ int igb_setup_tx_resources(struct igb_adapter *adapter, | |||
1704 | memset(tx_ring->buffer_info, 0, size); | 1704 | memset(tx_ring->buffer_info, 0, size); |
1705 | 1705 | ||
1706 | /* round up to nearest 4K */ | 1706 | /* round up to nearest 4K */ |
1707 | tx_ring->size = tx_ring->count * sizeof(struct e1000_tx_desc); | 1707 | tx_ring->size = tx_ring->count * sizeof(union e1000_adv_tx_desc); |
1708 | tx_ring->size = ALIGN(tx_ring->size, 4096); | 1708 | tx_ring->size = ALIGN(tx_ring->size, 4096); |
1709 | 1709 | ||
1710 | tx_ring->desc = pci_alloc_consistent(pdev, tx_ring->size, | 1710 | tx_ring->desc = pci_alloc_consistent(pdev, tx_ring->size, |
@@ -1773,7 +1773,7 @@ static void igb_configure_tx(struct igb_adapter *adapter) | |||
1773 | struct igb_ring *ring = &adapter->tx_ring[i]; | 1773 | struct igb_ring *ring = &adapter->tx_ring[i]; |
1774 | j = ring->reg_idx; | 1774 | j = ring->reg_idx; |
1775 | wr32(E1000_TDLEN(j), | 1775 | wr32(E1000_TDLEN(j), |
1776 | ring->count * sizeof(struct e1000_tx_desc)); | 1776 | ring->count * sizeof(union e1000_adv_tx_desc)); |
1777 | tdba = ring->dma; | 1777 | tdba = ring->dma; |
1778 | wr32(E1000_TDBAL(j), | 1778 | wr32(E1000_TDBAL(j), |
1779 | tdba & 0x00000000ffffffffULL); | 1779 | tdba & 0x00000000ffffffffULL); |