.. | .. |
---|
234 | 234 | } |
---|
235 | 235 | |
---|
236 | 236 | /** |
---|
237 | | - * iavf_irq_enable_queues - Enable interrupt for specified queues |
---|
| 237 | + * iavf_irq_enable_queues - Enable interrupt for all queues |
---|
238 | 238 | * @adapter: board private structure |
---|
239 | | - * @mask: bitmap of queues to enable |
---|
240 | 239 | **/ |
---|
241 | | -void iavf_irq_enable_queues(struct iavf_adapter *adapter, u32 mask) |
---|
| 240 | +void iavf_irq_enable_queues(struct iavf_adapter *adapter) |
---|
242 | 241 | { |
---|
243 | 242 | struct iavf_hw *hw = &adapter->hw; |
---|
244 | 243 | int i; |
---|
245 | 244 | |
---|
246 | 245 | for (i = 1; i < adapter->num_msix_vectors; i++) { |
---|
247 | | - if (mask & BIT(i - 1)) { |
---|
248 | | - wr32(hw, IAVF_VFINT_DYN_CTLN1(i - 1), |
---|
249 | | - IAVF_VFINT_DYN_CTLN1_INTENA_MASK | |
---|
250 | | - IAVF_VFINT_DYN_CTLN1_ITR_INDX_MASK); |
---|
251 | | - } |
---|
| 246 | + wr32(hw, IAVF_VFINT_DYN_CTLN1(i - 1), |
---|
| 247 | + IAVF_VFINT_DYN_CTLN1_INTENA_MASK | |
---|
| 248 | + IAVF_VFINT_DYN_CTLN1_ITR_INDX_MASK); |
---|
252 | 249 | } |
---|
253 | 250 | } |
---|
254 | 251 | |
---|
.. | .. |
---|
262 | 259 | struct iavf_hw *hw = &adapter->hw; |
---|
263 | 260 | |
---|
264 | 261 | iavf_misc_irq_enable(adapter); |
---|
265 | | - iavf_irq_enable_queues(adapter, ~0); |
---|
| 262 | + iavf_irq_enable_queues(adapter); |
---|
266 | 263 | |
---|
267 | 264 | if (flush) |
---|
268 | 265 | iavf_flush(hw); |
---|
.. | .. |
---|
1380 | 1377 | static void iavf_free_q_vectors(struct iavf_adapter *adapter) |
---|
1381 | 1378 | { |
---|
1382 | 1379 | int q_idx, num_q_vectors; |
---|
1383 | | - int napi_vectors; |
---|
1384 | 1380 | |
---|
1385 | 1381 | if (!adapter->q_vectors) |
---|
1386 | 1382 | return; |
---|
1387 | 1383 | |
---|
1388 | 1384 | num_q_vectors = adapter->num_msix_vectors - NONQ_VECS; |
---|
1389 | | - napi_vectors = adapter->num_active_queues; |
---|
1390 | 1385 | |
---|
1391 | 1386 | for (q_idx = 0; q_idx < num_q_vectors; q_idx++) { |
---|
1392 | 1387 | struct iavf_q_vector *q_vector = &adapter->q_vectors[q_idx]; |
---|
1393 | 1388 | |
---|
1394 | | - if (q_idx < napi_vectors) |
---|
1395 | | - netif_napi_del(&q_vector->napi); |
---|
| 1389 | + netif_napi_del(&q_vector->napi); |
---|
1396 | 1390 | } |
---|
1397 | 1391 | kfree(adapter->q_vectors); |
---|
1398 | 1392 | adapter->q_vectors = NULL; |
---|