diff options
Diffstat (limited to 'drivers/net/ethernet/atheros/atl1c/atl1c_main.c')
-rw-r--r-- | drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c index 9cc15701101b..85717cb306d1 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c | |||
@@ -989,12 +989,12 @@ static int atl1c_setup_ring_resources(struct atl1c_adapter *adapter) | |||
989 | } | 989 | } |
990 | for (i = 0; i < AT_MAX_TRANSMIT_QUEUE; i++) { | 990 | for (i = 0; i < AT_MAX_TRANSMIT_QUEUE; i++) { |
991 | tpd_ring[i].buffer_info = | 991 | tpd_ring[i].buffer_info = |
992 | (struct atl1c_buffer *) (tpd_ring->buffer_info + count); | 992 | (tpd_ring->buffer_info + count); |
993 | count += tpd_ring[i].count; | 993 | count += tpd_ring[i].count; |
994 | } | 994 | } |
995 | 995 | ||
996 | rfd_ring->buffer_info = | 996 | rfd_ring->buffer_info = |
997 | (struct atl1c_buffer *) (tpd_ring->buffer_info + count); | 997 | (tpd_ring->buffer_info + count); |
998 | count += rfd_ring->count; | 998 | count += rfd_ring->count; |
999 | rx_desc_count += rfd_ring->count; | 999 | rx_desc_count += rfd_ring->count; |
1000 | 1000 | ||
@@ -1227,7 +1227,7 @@ static void atl1c_start_mac(struct atl1c_adapter *adapter) | |||
1227 | */ | 1227 | */ |
1228 | static int atl1c_reset_mac(struct atl1c_hw *hw) | 1228 | static int atl1c_reset_mac(struct atl1c_hw *hw) |
1229 | { | 1229 | { |
1230 | struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter; | 1230 | struct atl1c_adapter *adapter = hw->adapter; |
1231 | struct pci_dev *pdev = adapter->pdev; | 1231 | struct pci_dev *pdev = adapter->pdev; |
1232 | u32 ctrl_data = 0; | 1232 | u32 ctrl_data = 0; |
1233 | 1233 | ||
@@ -1531,8 +1531,7 @@ static inline void atl1c_clear_phy_int(struct atl1c_adapter *adapter) | |||
1531 | static bool atl1c_clean_tx_irq(struct atl1c_adapter *adapter, | 1531 | static bool atl1c_clean_tx_irq(struct atl1c_adapter *adapter, |
1532 | enum atl1c_trans_queue type) | 1532 | enum atl1c_trans_queue type) |
1533 | { | 1533 | { |
1534 | struct atl1c_tpd_ring *tpd_ring = (struct atl1c_tpd_ring *) | 1534 | struct atl1c_tpd_ring *tpd_ring = &adapter->tpd_ring[type]; |
1535 | &adapter->tpd_ring[type]; | ||
1536 | struct atl1c_buffer *buffer_info; | 1535 | struct atl1c_buffer *buffer_info; |
1537 | struct pci_dev *pdev = adapter->pdev; | 1536 | struct pci_dev *pdev = adapter->pdev; |
1538 | u16 next_to_clean = atomic_read(&tpd_ring->next_to_clean); | 1537 | u16 next_to_clean = atomic_read(&tpd_ring->next_to_clean); |