Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

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

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 7eb38ea9ba56318ba9e6c4686558ff12d3221ce3..559c48e66afc4904048d1486b636742eb14e4608 100644 (file)
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -31,7 +31,6 @@
 #include <linux/average.h>
 #include <linux/filter.h>
 #include <linux/kernel.h>
-#include <linux/pci.h>
 #include <net/route.h>
 #include <net/xdp.h>
 #include <net/net_failover.h>
@@ -1568,7 +1567,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. */
@@ -1588,7 +1587,8 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
                dev->stats.tx_fifo_errors++;
                if (net_ratelimit())
                        dev_warn(&dev->dev,
-                                "Unexpected TXQ (%d) queue failure: %d\n", qnum, err);
+                                "Unexpected TXQ (%d) queue failure: %d\n",
+                                qnum, err);
                dev->stats.tx_dropped++;
                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
@@ -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;
 }
 
@@ -2384,7 +2384,7 @@ static int virtnet_set_guest_offloads(struct virtnet_info *vi, u64 offloads)
 
        if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_GUEST_OFFLOADS,
                                  VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET, &sg)) {
-               dev_warn(&vi->dev->dev, "Fail to set guest offload. \n");
+               dev_warn(&vi->dev->dev, "Fail to set guest offload.\n");
                return -EINVAL;
        }
 
@@ -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);
 
@@ -3115,8 +3115,9 @@ static int virtnet_probe(struct virtio_device *vdev)
                        /* Should never trigger: MTU was previously validated
                         * in virtnet_validate.
                         */
-                       dev_err(&vdev->dev, "device MTU appears to have changed "
-                               "it is now %d < %d", mtu, dev->min_mtu);
+                       dev_err(&vdev->dev,
+                               "device MTU appears to have changed it is now %d < %d",
+                               mtu, dev->min_mtu);
                        goto free;
                }