From 283c7c63f5c56c4d0340fb39093fb47e75cb122e Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 8 Oct 2009 19:58:30 +0100 Subject: net: allow NICs to be connected to netdevs Introduce a 'peer' member to VLANClientState as an alternative to a vlan. The idea being that packets are transfered directly from peer clients rather than going through a vlan. Patchworks-ID: 35516 Signed-off-by: Mark McLoughlin Signed-off-by: Anthony Liguori --- hw/mipsnet.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'hw/mipsnet.c') diff --git a/hw/mipsnet.c b/hw/mipsnet.c index e98c57699b..ea8b570795 100644 --- a/hw/mipsnet.c +++ b/hw/mipsnet.c @@ -262,8 +262,9 @@ void mipsnet_init (int base, qemu_irq irq, NICInfo *nd) s->io_base = base; s->irq = irq; - if (nd && nd->vlan) { - s->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, + if (nd) { + s->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->netdev, + nd->model, nd->name, mipsnet_can_receive, mipsnet_receive, NULL, mipsnet_cleanup, s); } else { -- cgit 1.4.1