[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/7] ne2000: Drop ne2000_can_receive
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 7/7] ne2000: Drop ne2000_can_receive |
Date: |
Wed, 2 Sep 2015 17:14:53 +0100 |
From: Fam Zheng <address@hidden>
ne2000_receive already checks the same conditions and drops the packet
if it's not ready, removing the .can_receive callback avoids the
necessity to add explicit flushes when the conditions turn true (which
is required by the new semantics of .can_receive since 6e99c63
"net/socket: Drop net_socket_can_send").
Plus the "return 1" if E8390_STOP is also suspicious.
Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/net/ne2000-isa.c | 1 -
hw/net/ne2000.c | 10 ----------
hw/net/ne2000.h | 1 -
3 files changed, 12 deletions(-)
diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c
index 17e7199..18b0644 100644
--- a/hw/net/ne2000-isa.c
+++ b/hw/net/ne2000-isa.c
@@ -44,7 +44,6 @@ typedef struct ISANE2000State {
static NetClientInfo net_ne2000_isa_info = {
.type = NET_CLIENT_OPTIONS_KIND_NIC,
.size = sizeof(NICState),
- .can_receive = ne2000_can_receive,
.receive = ne2000_receive,
};
diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
index 3492db3..53c704a 100644
--- a/hw/net/ne2000.c
+++ b/hw/net/ne2000.c
@@ -165,15 +165,6 @@ static int ne2000_buffer_full(NE2000State *s)
return 0;
}
-int ne2000_can_receive(NetClientState *nc)
-{
- NE2000State *s = qemu_get_nic_opaque(nc);
-
- if (s->cmd & E8390_STOP)
- return 1;
- return !ne2000_buffer_full(s);
-}
-
#define MIN_BUF_SIZE 60
ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
@@ -705,7 +696,6 @@ void ne2000_setup_io(NE2000State *s, DeviceState *dev,
unsigned size)
static NetClientInfo net_ne2000_info = {
.type = NET_CLIENT_OPTIONS_KIND_NIC,
.size = sizeof(NICState),
- .can_receive = ne2000_can_receive,
.receive = ne2000_receive,
};
diff --git a/hw/net/ne2000.h b/hw/net/ne2000.h
index e500306..d022b28 100644
--- a/hw/net/ne2000.h
+++ b/hw/net/ne2000.h
@@ -34,7 +34,6 @@ typedef struct NE2000State {
void ne2000_setup_io(NE2000State *s, DeviceState *dev, unsigned size);
extern const VMStateDescription vmstate_ne2000;
void ne2000_reset(NE2000State *s);
-int ne2000_can_receive(NetClientState *nc);
ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_);
#endif
--
2.4.3
- [Qemu-devel] [PULL 0/7] Net patches, Stefan Hajnoczi, 2015/09/02
- [Qemu-devel] [PULL 1/7] rtl8139: remove duplicate net/eth.h definitions, Stefan Hajnoczi, 2015/09/02
- [Qemu-devel] [PULL 2/7] rtl8139: use net/eth.h macros instead of custom macros, Stefan Hajnoczi, 2015/09/02
- [Qemu-devel] [PULL 3/7] rtl8139: use ldl/stl wrapper for unaligned 32-bit access, Stefan Hajnoczi, 2015/09/02
- [Qemu-devel] [PULL 4/7] rtl8139: Fix receive buffer overflow check, Stefan Hajnoczi, 2015/09/02
- [Qemu-devel] [PULL 5/7] rtl8139: Do not consume the packet during overflow in standard mode., Stefan Hajnoczi, 2015/09/02
- [Qemu-devel] [PULL 6/7] vmxnet3: Drop net_vmxnet3_info.can_receive, Stefan Hajnoczi, 2015/09/02
- [Qemu-devel] [PULL 7/7] ne2000: Drop ne2000_can_receive,
Stefan Hajnoczi <=
- Re: [Qemu-devel] [PULL 0/7] Net patches, Peter Maydell, 2015/09/03