net: move skb->xmit_more hint to softnet data

[linux.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 e100054a3765e2f16c4aba9f3af8411c9dcdca4a..60cec3540dd783e6e079451a719a9d71fb14898e 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -8297,7 +8297,7 @@ static int ixgbe_tx_map(struct ixgbe_ring *tx_ring,
 
        ixgbe_maybe_stop_tx(tx_ring, DESC_NEEDED);
 
-       if (netif_xmit_stopped(txring_txq(tx_ring)) || !skb->xmit_more) {
+       if (netif_xmit_stopped(txring_txq(tx_ring)) || !netdev_xmit_more()) {
                writel(i, tx_ring->tail);
 
                /* we need this if more than one processor can write to our tail
@@ -8483,8 +8483,7 @@ static void ixgbe_atr(struct ixgbe_ring *ring,
 
 #ifdef IXGBE_FCOE
 static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb,
-                             struct net_device *sb_dev,
-                             select_queue_fallback_t fallback)
+                             struct net_device *sb_dev)
 {
        struct ixgbe_adapter *adapter;
        struct ixgbe_ring_feature *f;
@@ -8514,7 +8513,7 @@ static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb,
                        break;
                /* fall through */
        default:
-               return fallback(dev, skb, sb_dev);
+               return netdev_pick_tx(dev, skb, sb_dev);
        }
 
        f = &adapter->ring_feature[RING_F_FCOE];
@@ -9796,7 +9795,7 @@ static int ixgbe_set_features(struct net_device *netdev,
                            NETIF_F_HW_VLAN_CTAG_FILTER))
                ixgbe_set_rx_mode(netdev);
 
-       return 0;
+       return 1;
 }
 
 /**