net: Remove ndo_xmit_flush netdev operation, use signalling instead.

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

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 62421086d3e6e2b14a1a8b94d56ce964249457e4..f0c2824f5e0f79a13a6ec94064a78ae30911b0fc 100644 (file)
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -953,15 +953,10 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
                }
        }
 
-       return NETDEV_TX_OK;
-}
+       if (!skb->xmit_more)
+               virtqueue_kick(sq->vq);
 
-static void xmit_flush(struct net_device *dev, u16 qnum)
-{
-       struct virtnet_info *vi = netdev_priv(dev);
-       struct send_queue *sq = &vi->sq[qnum];
-
-       virtqueue_kick(sq->vq);
+       return NETDEV_TX_OK;
 }
 
 /*
@@ -1393,7 +1388,6 @@ static const struct net_device_ops virtnet_netdev = {
        .ndo_open            = virtnet_open,
        .ndo_stop            = virtnet_close,
        .ndo_start_xmit      = start_xmit,
-       .ndo_xmit_flush      = xmit_flush,
        .ndo_validate_addr   = eth_validate_addr,
        .ndo_set_mac_address = virtnet_set_mac_address,
        .ndo_set_rx_mode     = virtnet_set_rx_mode,