From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48344) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHEp4-0006hN-SG for qemu-devel@nongnu.org; Mon, 20 Jul 2015 13:25:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZHEp4-0000sy-2R for qemu-devel@nongnu.org; Mon, 20 Jul 2015 13:25:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55471) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHEp3-0000sd-Hl for qemu-devel@nongnu.org; Mon, 20 Jul 2015 13:25:49 -0400 From: Stefan Hajnoczi Date: Mon, 20 Jul 2015 18:25:22 +0100 Message-Id: <1437413125-24888-5-git-send-email-stefanha@redhat.com> In-Reply-To: <1437413125-24888-1-git-send-email-stefanha@redhat.com> References: <1437413125-24888-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL for-2.4 4/7] musicpal: Drop eth_can_receive List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Fam Zheng , Stefan Hajnoczi From: Fam Zheng True is the default. Signed-off-by: Fam Zheng Reviewed-by: Jason Wang Message-id: 1435734647-8371-2-git-send-email-famz@redhat.com Signed-off-by: Stefan Hajnoczi --- hw/arm/musicpal.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index a3b1314..42f66b3 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -187,11 +187,6 @@ static void eth_rx_desc_get(uint32_t addr, mv88w8618_rx_desc *desc) le32_to_cpus(&desc->next); } -static int eth_can_receive(NetClientState *nc) -{ - return 1; -} - static ssize_t eth_receive(NetClientState *nc, const uint8_t *buf, size_t size) { mv88w8618_eth_state *s = qemu_get_nic_opaque(nc); @@ -381,7 +376,6 @@ static void eth_cleanup(NetClientState *nc) static NetClientInfo net_mv88w8618_info = { .type = NET_CLIENT_OPTIONS_KIND_NIC, .size = sizeof(NICState), - .can_receive = eth_can_receive, .receive = eth_receive, .cleanup = eth_cleanup, }; -- 2.4.3