From owner-svn-soc-all@freebsd.org Fri Aug 5 14:17:53 2016 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E927CBB0B5B for ; Fri, 5 Aug 2016 14:17:53 +0000 (UTC) (envelope-from vincenzo@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DCA36161F for ; Fri, 5 Aug 2016 14:17:53 +0000 (UTC) (envelope-from vincenzo@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id u75EHr7h023559 for ; Fri, 5 Aug 2016 14:17:53 GMT (envelope-from vincenzo@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u75EHqwZ023504 for svn-soc-all@FreeBSD.org; Fri, 5 Aug 2016 14:17:52 GMT (envelope-from vincenzo@FreeBSD.org) Date: Fri, 5 Aug 2016 14:17:52 GMT Message-Id: <201608051417.u75EHqwZ023504@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to vincenzo@FreeBSD.org using -f From: vincenzo@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r307242 - soc2016/vincenzo/head/usr.sbin/bhyve MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2016 14:17:54 -0000 Author: vincenzo Date: Fri Aug 5 14:17:52 2016 New Revision: 307242 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=307242 Log: bhyve: pci_virtio_net: don't advertise MRG_RX_BUF capability Modified: soc2016/vincenzo/head/usr.sbin/bhyve/net_backends.c soc2016/vincenzo/head/usr.sbin/bhyve/pci_virtio_net.c Modified: soc2016/vincenzo/head/usr.sbin/bhyve/net_backends.c ============================================================================== --- soc2016/vincenzo/head/usr.sbin/bhyve/net_backends.c Fri Aug 5 14:16:58 2016 (r307241) +++ soc2016/vincenzo/head/usr.sbin/bhyve/net_backends.c Fri Aug 5 14:17:52 2016 (r307242) @@ -341,14 +341,6 @@ net_backend_cb_t cb; void *cb_param; - /* Support for splitted receives. */ - int rx_continue; - int rx_idx; - uint8_t *rx_buf; - int rx_avail; - int rx_morefrag; - int rx_avail_slots; - struct ptnetmap_state ptnetmap; }; @@ -588,7 +580,6 @@ priv->cb = cb; priv->cb_param = param; - priv->rx_continue = 0; be->fd = priv->nmd->fd; be->priv = priv; Modified: soc2016/vincenzo/head/usr.sbin/bhyve/pci_virtio_net.c ============================================================================== --- soc2016/vincenzo/head/usr.sbin/bhyve/pci_virtio_net.c Fri Aug 5 14:16:58 2016 (r307241) +++ soc2016/vincenzo/head/usr.sbin/bhyve/pci_virtio_net.c Fri Aug 5 14:17:52 2016 (r307242) @@ -64,8 +64,9 @@ #define VTNET_MAXSEGS 256 +/* Our capabilities: we don't support VIRTIO_NET_F_MRG_RXBUF at the moment. */ #define VTNET_S_HOSTCAPS \ - ( VIRTIO_NET_F_MAC | VIRTIO_NET_F_MRG_RXBUF | VIRTIO_NET_F_STATUS | \ + ( VIRTIO_NET_F_MAC | VIRTIO_NET_F_STATUS | \ VIRTIO_F_NOTIFY_ON_EMPTY | VIRTIO_RING_F_INDIRECT_DESC) /*