Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-09-11' into...

[qemu.git] / hw / net / lance.c

diff --git a/hw/net/lance.c b/hw/net/lance.c
index ff7e789563615a55172166ce012f2e090834fb9d..780b39d65a50f601595deeb8f1cfbc27d3c16d88 100644 (file)
--- a/hw/net/lance.c
+++ b/hw/net/lance.c
@@ -94,7 +94,6 @@ static const MemoryRegionOps lance_mem_ops = {
 static NetClientInfo net_lance_info = {
     .type = NET_CLIENT_OPTIONS_KIND_NIC,
     .size = sizeof(NICState),
-    .can_receive = pcnet_can_receive,
     .receive = pcnet_receive,
     .link_status_changed = pcnet_set_link_status,
 };
@@ -126,7 +125,8 @@ static int lance_init(SysBusDevice *sbd)
 
     s->phys_mem_read = ledma_memory_read;
     s->phys_mem_write = ledma_memory_write;
-    return pcnet_common_init(dev, s, &net_lance_info);
+    pcnet_common_init(dev, s, &net_lance_info);
+    return 0;
 }
 
 static void lance_reset(DeviceState *dev)