From b450d615b5c3d5d85a990934fe19c451d6166115 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 20 Mar 2013 15:44:29 +1030 Subject: [PATCH] --- yaml --- r: 370949 b: refs/heads/master c: 71bcbecc89a6b24f2c60d3e4271e76013fa46860 h: refs/heads/master i: 370947: c59a45ce48f5b6e972229a69530081635b4d41a8 v: v3 --- [refs] | 2 +- trunk/drivers/net/caif/caif_virtio.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 71a000a07f62..a712dbddfb54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6797999d99587e7b4189cf24c8f1053e02444703 +refs/heads/master: 71bcbecc89a6b24f2c60d3e4271e76013fa46860 diff --git a/trunk/drivers/net/caif/caif_virtio.c b/trunk/drivers/net/caif/caif_virtio.c index b1e1205e4e28..f6caa1eb4cd6 100644 --- a/trunk/drivers/net/caif/caif_virtio.c +++ b/trunk/drivers/net/caif/caif_virtio.c @@ -572,8 +572,7 @@ static int cfv_netdev_tx(struct sk_buff *skb, struct net_device *netdev) goto err; } - ret = virtqueue_add_buf(cfv->vq_tx, &sg, 1, 0, - buf_info, GFP_ATOMIC); + ret = virtqueue_add_outbuf(cfv->vq_tx, &sg, 1, buf_info, GFP_ATOMIC); if (unlikely((ret < 0))) { /* If flow control works, this shouldn't happen */ netdev_warn(cfv->ndev, "Failed adding buffer to TX vring:%d\n",