net: move skb->xmit_more hint to softnet data

[linux.git] / drivers / net / virtio_net.c

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 7eb38ea9ba56318ba9e6c4686558ff12d3221ce3..ba246fc475ae58c8baddd282e81af19a401ef280 100644 (file)
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1568,7 +1568,7 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
        struct send_queue *sq = &vi->sq[qnum];
        int err;
        struct netdev_queue *txq = netdev_get_tx_queue(dev, qnum);
-       bool kick = !skb->xmit_more;
+       bool kick = !netdev_xmit_more();
        bool use_napi = sq->napi.weight;
 
        /* Free up any pending old buffers before queueing new ones. */
@@ -1925,7 +1925,7 @@ static int virtnet_vlan_rx_kill_vid(struct net_device *dev,
        return 0;
 }
 
-static void virtnet_clean_affinity(struct virtnet_info *vi, long hcpu)
+static void virtnet_clean_affinity(struct virtnet_info *vi)
 {
        int i;
 
@@ -1949,7 +1949,7 @@ static void virtnet_set_affinity(struct virtnet_info *vi)
        int stride;
 
        if (!zalloc_cpumask_var(&mask, GFP_KERNEL)) {
-               virtnet_clean_affinity(vi, -1);
+               virtnet_clean_affinity(vi);
                return;
        }
 
@@ -1999,7 +1999,7 @@ static int virtnet_cpu_down_prep(unsigned int cpu, struct hlist_node *node)
        struct virtnet_info *vi = hlist_entry_safe(node, struct virtnet_info,
                                                   node);
 
-       virtnet_clean_affinity(vi, cpu);
+       virtnet_clean_affinity(vi);
        return 0;
 }
 
@@ -2735,7 +2735,7 @@ static void virtnet_del_vqs(struct virtnet_info *vi)
 {
        struct virtio_device *vdev = vi->vdev;
 
-       virtnet_clean_affinity(vi, -1);
+       virtnet_clean_affinity(vi);
 
        vdev->config->del_vqs(vdev);