From: David S. Miller <davem@davemloft.net>
Date: Sun, 3 May 2009 21:07:43 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d252a5e7b73026b3ba3c49940724292099e634f0;p=linux-beck.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
---

d252a5e7b73026b3ba3c49940724292099e634f0
diff --cc drivers/net/virtio_net.c
index 071855871524,4d1d47953fc6..6cc5bcd34fb0
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -620,10 -620,14 +620,11 @@@ static bool virtnet_send_command(struc
  	struct virtio_net_ctrl_hdr ctrl;
  	virtio_net_ctrl_ack status = ~0;
  	unsigned int tmp;
+ 	int i;
  
 -	if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)) {
 -		BUG();  /* Caller should know better */
 -		return false;
 -	}
 -
 -	BUG_ON(out + in > VIRTNET_SEND_COMMAND_SG_MAX);
 +	/* Caller should know better */
 +	BUG_ON(!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ) ||
 +		(out + in > VIRTNET_SEND_COMMAND_SG_MAX));
  
  	out++; /* Add header */
  	in++; /* Add return status */
@@@ -634,10 -638,12 +635,11 @@@
  	sg_init_table(sg, out + in);
  
  	sg_set_buf(&sg[0], &ctrl, sizeof(ctrl));
- 	memcpy(&sg[1], data, sizeof(struct scatterlist) * (out + in - 2));
+ 	for_each_sg(data, s, out + in - 2, i)
+ 		sg_set_buf(&sg[i + 1], sg_virt(s), s->length);
  	sg_set_buf(&sg[out + in - 1], &status, sizeof(status));
  
 -	if (vi->cvq->vq_ops->add_buf(vi->cvq, sg, out, in, vi) != 0)
 -		BUG();
 +	BUG_ON(vi->cvq->vq_ops->add_buf(vi->cvq, sg, out, in, vi));
  
  	vi->cvq->vq_ops->kick(vi->cvq);