Merge branch 'linus' into irq/core, to fix conflict

[platform/kernel/linux-rpi.git] / drivers / net / ethernet / intel / ixgbe / ixgbe_main.c

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 45e2ec4..7068ecb 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -3247,8 +3247,8 @@ static int ixgbe_request_msix_irqs(struct ixgbe_adapter *adapter)
                /* If Flow Director is enabled, set interrupt affinity */
                if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {
                        /* assign the mask for this irq */
-                       irq_set_affinity_hint(entry->vector,
-                                             &q_vector->affinity_mask);
+                       irq_update_affinity_hint(entry->vector,
+                                                &q_vector->affinity_mask);
                }
        }
 
@@ -3264,8 +3264,8 @@ static int ixgbe_request_msix_irqs(struct ixgbe_adapter *adapter)
 free_queue_irqs:
        while (vector) {
                vector--;
-               irq_set_affinity_hint(adapter->msix_entries[vector].vector,
-                                     NULL);
+               irq_update_affinity_hint(adapter->msix_entries[vector].vector,
+                                        NULL);
                free_irq(adapter->msix_entries[vector].vector,
                         adapter->q_vector[vector]);
        }
@@ -3398,7 +3398,7 @@ static void ixgbe_free_irq(struct ixgbe_adapter *adapter)
                        continue;
 
                /* clear the affinity_mask in the IRQ descriptor */
-               irq_set_affinity_hint(entry->vector, NULL);
+               irq_update_affinity_hint(entry->vector, NULL);
 
                free_irq(entry->vector, q_vector);
        }