diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2009-11-25 18:49:30 +0000 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-03 09:41:34 -0600 |
| commit | 665a3b071dc6351f9d1840dc50f7cda80bca5f40 (patch) | |
| tree | 1342018a8e29fd3b027776e261732f6db70452cf /hw | |
| parent | 68da46eeb6cbe60b03f7afcb4e3cd1b5f14cc259 (diff) | |
net: remove VLANClientState members now in NetClientInfo
Add a NetClientInfo pointer to VLANClientState and use that
for the typecode and function pointers.
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/dp8393x.c | 4 | ||||
| -rw-r--r-- | hw/virtio-net.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/dp8393x.c b/hw/dp8393x.c index be9714dec1..e65e4d1535 100644 --- a/hw/dp8393x.c +++ b/hw/dp8393x.c @@ -407,9 +407,9 @@ static void do_transmit_packets(dp8393xState *s) if (s->regs[SONIC_RCR] & (SONIC_RCR_LB1 | SONIC_RCR_LB0)) { /* Loopback */ s->regs[SONIC_TCR] |= SONIC_TCR_CRSL; - if (s->nic->nc.can_receive(&s->nic->nc)) { + if (s->nic->nc.info->can_receive(&s->nic->nc)) { s->loopback_packet = 1; - s->nic->nc.receive(&s->nic->nc, s->tx_buffer, tx_len); + s->nic->nc.info->receive(&s->nic->nc, s->tx_buffer, tx_len); } } else { /* Transmit packet */ diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 4f8d89e256..2f201ffc76 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -129,7 +129,7 @@ static int peer_has_vnet_hdr(VirtIONet *n) if (!n->nic->nc.peer) return 0; - if (n->nic->nc.peer->type != NET_CLIENT_TYPE_TAP) + if (n->nic->nc.peer->info->type != NET_CLIENT_TYPE_TAP) return 0; n->has_vnet_hdr = tap_has_vnet_hdr(n->nic->nc.peer); |