Commit-ID: bdbbb8c38d947a1cbc64064b3be7c130adb835f3 Gitweb: http://git.kernel.org/tip/bdbbb8c38d947a1cbc64064b3be7c130adb835f3 Author: Asias He <asias.hejun@xxxxxxxxx> AuthorDate: Wed, 29 Jun 2011 16:47:30 +0800 Committer: Pekka Enberg <penberg@xxxxxxxxxx> CommitDate: Thu, 30 Jun 2011 10:42:45 +0300 kvm tools: Reanme net_device to net_dev This patch makes virtio net device's name convention consistent with others in virtio/*.c. struct {net_dev, blk_dev, con_dev, rng_dev, p9_dev}. Signed-off-by: Asias He <asias.hejun@xxxxxxxxx> Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx> --- tools/kvm/virtio/net.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/kvm/virtio/net.c b/tools/kvm/virtio/net.c index 68967f2..7eebee0 100644 --- a/tools/kvm/virtio/net.c +++ b/tools/kvm/virtio/net.c @@ -40,7 +40,7 @@ static struct pci_device_header pci_header = { .subsys_id = VIRTIO_ID_NET, }; -struct net_device { +struct net_dev { pthread_mutex_t mutex; struct virt_queue vqs[VIRTIO_NET_NUM_QUEUES]; @@ -68,8 +68,9 @@ struct net_device { }; -static struct net_device ndev = { - .mutex = PTHREAD_MUTEX_INITIALIZER, + +static struct net_dev ndev = { + .mutex = PTHREAD_MUTEX_INITIALIZER, .config = { .mac = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55 }, -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html