From: Fam Zheng <famz@redhat.com>
Date: Wed, 1 Jul 2015 02:26:27 +0000 (+0800)
Subject: vmxnet3: Drop net_vmxnet3_info.can_receive
X-Git-Tag: v2.4.1~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40161bf27b6f0143062f588b496f0a66b6ec769b;p=thirdparty%2Fqemu.git

vmxnet3: Drop net_vmxnet3_info.can_receive

Commit 6e99c63 ("net/socket: Drop net_socket_can_send") changed the
semantics around .can_receive for sockets to now require the device to
flush queued pkts when transitioning to a .can_receive=true state. But
it's OK to drop incoming packets when the link is not active.

Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
(cherry picked from commit 2734a20b8161831ba68c9166014e00522599d1e2)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index 59b06b84126..2504425cf98 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -1988,7 +1988,6 @@ static void vmxnet3_set_link_status(NetClientState *nc)
 static NetClientInfo net_vmxnet3_info = {
         .type = NET_CLIENT_OPTIONS_KIND_NIC,
         .size = sizeof(NICState),
-        .can_receive = vmxnet3_can_receive,
         .receive = vmxnet3_receive,
         .link_status_changed = vmxnet3_set_link_status,
 };