From 665a3b071dc6351f9d1840dc50f7cda80bca5f40 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 25 Nov 2009 18:49:30 +0000 Subject: 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 Signed-off-by: Anthony Liguori --- net/tap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'net') diff --git a/net/tap.c b/net/tap.c index d34feecd74..a327a9a6bf 100644 --- a/net/tap.c +++ b/net/tap.c @@ -214,7 +214,7 @@ int tap_has_ufo(VLANClientState *nc) { TAPState *s = DO_UPCAST(TAPState, nc, nc); - assert(nc->type == NET_CLIENT_TYPE_TAP); + assert(nc->info->type == NET_CLIENT_TYPE_TAP); return s->has_ufo; } @@ -223,7 +223,7 @@ int tap_has_vnet_hdr(VLANClientState *nc) { TAPState *s = DO_UPCAST(TAPState, nc, nc); - assert(nc->type == NET_CLIENT_TYPE_TAP); + assert(nc->info->type == NET_CLIENT_TYPE_TAP); return s->has_vnet_hdr; } @@ -234,7 +234,7 @@ void tap_using_vnet_hdr(VLANClientState *nc, int using_vnet_hdr) using_vnet_hdr = using_vnet_hdr != 0; - assert(nc->type == NET_CLIENT_TYPE_TAP); + assert(nc->info->type == NET_CLIENT_TYPE_TAP); assert(s->has_vnet_hdr == using_vnet_hdr); s->using_vnet_hdr = using_vnet_hdr; -- cgit v1.2.1