From: Paul Brook <paul@codesourcery.com>
Date: Thu, 11 Jun 2009 12:22:27 +0000 (+0100)
Subject: Fix stellaris ethernet
X-Git-Tag: v0.11.0-rc0~430
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57b452a8487df30d084ce2b56a993ba7473469e3;p=thirdparty%2Fqemu.git

Fix stellaris ethernet

Revert bogus part of e3f5ec2b
(pass VLANClientState* as first arg to receive handlers)

Signed-off-by: Paul Brook <paul@codesourcery.com>
---

diff --git a/hw/stellaris_enet.c b/hw/stellaris_enet.c
index f5b83e445c8..8586db61262 100644
--- a/hw/stellaris_enet.c
+++ b/hw/stellaris_enet.c
@@ -130,9 +130,9 @@ static int stellaris_enet_can_receive(VLANClientState *vc)
     return (s->np < 31);
 }
 
-static uint32_t stellaris_enet_read(VLANClientState *vc, target_phys_addr_t offset)
+static uint32_t stellaris_enet_read(void *opaque, target_phys_addr_t offset)
 {
-    stellaris_enet_state *s = vc->opaque;
+    stellaris_enet_state *s = (stellaris_enet_state *)opaque;
     uint32_t val;
 
     switch (offset) {