net: move skb->xmit_more hint to softnet data

[linux.git] / drivers / net / ethernet / cisco / enic / enic_main.c

diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index 9a7f70db20c7f67da8608f65b5e9c98efbce2412..acb2856936d2027babd1c06b02896a91b4d3d2e5 100644 (file)
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -119,7 +119,7 @@ static void enic_init_affinity_hint(struct enic *enic)
 
        for (i = 0; i < enic->intr_count; i++) {
                if (enic_is_err_intr(enic, i) || enic_is_notify_intr(enic, i) ||
-                   (enic->msix[i].affinity_mask &&
+                   (cpumask_available(enic->msix[i].affinity_mask) &&
                     !cpumask_empty(enic->msix[i].affinity_mask)))
                        continue;
                if (zalloc_cpumask_var(&enic->msix[i].affinity_mask,
@@ -148,7 +148,7 @@ static void enic_set_affinity_hint(struct enic *enic)
        for (i = 0; i < enic->intr_count; i++) {
                if (enic_is_err_intr(enic, i)           ||
                    enic_is_notify_intr(enic, i)        ||
-                   !enic->msix[i].affinity_mask        ||
+                   !cpumask_available(enic->msix[i].affinity_mask) ||
                    cpumask_empty(enic->msix[i].affinity_mask))
                        continue;
                err = irq_set_affinity_hint(enic->msix_entry[i].vector,
@@ -161,7 +161,7 @@ static void enic_set_affinity_hint(struct enic *enic)
        for (i = 0; i < enic->wq_count; i++) {
                int wq_intr = enic_msix_wq_intr(enic, i);
 
-               if (enic->msix[wq_intr].affinity_mask &&
+               if (cpumask_available(enic->msix[wq_intr].affinity_mask) &&
                    !cpumask_empty(enic->msix[wq_intr].affinity_mask))
                        netif_set_xps_queue(enic->netdev,
                                            enic->msix[wq_intr].affinity_mask,
@@ -897,7 +897,7 @@ static netdev_tx_t enic_hard_start_xmit(struct sk_buff *skb,
        if (vnic_wq_desc_avail(wq) < MAX_SKB_FRAGS + ENIC_DESC_MAX_SPLITS)
                netif_tx_stop_queue(txq);
        skb_tx_timestamp(skb);
-       if (!skb->xmit_more || netif_xmit_stopped(txq))
+       if (!netdev_xmit_more() || netif_xmit_stopped(txq))
                vnic_wq_doorbell(wq);
 
        spin_unlock(&enic->wq_lock[txq_map]);