diff options
Diffstat (limited to 'drivers/net/ethernet/intel/fm10k/fm10k_pci.c')
-rw-r--r-- | drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c index 73928dbe714f..bb236fa44048 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c | |||
@@ -898,7 +898,7 @@ static void fm10k_configure_tx_ring(struct fm10k_intfc *interface, | |||
898 | 898 | ||
899 | /* Map interrupt */ | 899 | /* Map interrupt */ |
900 | if (ring->q_vector) { | 900 | if (ring->q_vector) { |
901 | txint = ring->q_vector->v_idx + NON_Q_VECTORS(hw); | 901 | txint = ring->q_vector->v_idx + NON_Q_VECTORS; |
902 | txint |= FM10K_INT_MAP_TIMER0; | 902 | txint |= FM10K_INT_MAP_TIMER0; |
903 | } | 903 | } |
904 | 904 | ||
@@ -1037,7 +1037,7 @@ static void fm10k_configure_rx_ring(struct fm10k_intfc *interface, | |||
1037 | 1037 | ||
1038 | /* Map interrupt */ | 1038 | /* Map interrupt */ |
1039 | if (ring->q_vector) { | 1039 | if (ring->q_vector) { |
1040 | rxint = ring->q_vector->v_idx + NON_Q_VECTORS(hw); | 1040 | rxint = ring->q_vector->v_idx + NON_Q_VECTORS; |
1041 | rxint |= FM10K_INT_MAP_TIMER1; | 1041 | rxint |= FM10K_INT_MAP_TIMER1; |
1042 | } | 1042 | } |
1043 | 1043 | ||
@@ -1720,10 +1720,9 @@ int fm10k_mbx_request_irq(struct fm10k_intfc *interface) | |||
1720 | void fm10k_qv_free_irq(struct fm10k_intfc *interface) | 1720 | void fm10k_qv_free_irq(struct fm10k_intfc *interface) |
1721 | { | 1721 | { |
1722 | int vector = interface->num_q_vectors; | 1722 | int vector = interface->num_q_vectors; |
1723 | struct fm10k_hw *hw = &interface->hw; | ||
1724 | struct msix_entry *entry; | 1723 | struct msix_entry *entry; |
1725 | 1724 | ||
1726 | entry = &interface->msix_entries[NON_Q_VECTORS(hw) + vector]; | 1725 | entry = &interface->msix_entries[NON_Q_VECTORS + vector]; |
1727 | 1726 | ||
1728 | while (vector) { | 1727 | while (vector) { |
1729 | struct fm10k_q_vector *q_vector; | 1728 | struct fm10k_q_vector *q_vector; |
@@ -1760,7 +1759,7 @@ int fm10k_qv_request_irq(struct fm10k_intfc *interface) | |||
1760 | unsigned int ri = 0, ti = 0; | 1759 | unsigned int ri = 0, ti = 0; |
1761 | int vector, err; | 1760 | int vector, err; |
1762 | 1761 | ||
1763 | entry = &interface->msix_entries[NON_Q_VECTORS(hw)]; | 1762 | entry = &interface->msix_entries[NON_Q_VECTORS]; |
1764 | 1763 | ||
1765 | for (vector = 0; vector < interface->num_q_vectors; vector++) { | 1764 | for (vector = 0; vector < interface->num_q_vectors; vector++) { |
1766 | struct fm10k_q_vector *q_vector = interface->q_vector[vector]; | 1765 | struct fm10k_q_vector *q_vector = interface->q_vector[vector]; |