Date: Fri, 5 Aug 2016 14:17:52 GMT From: vincenzo@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r307242 - soc2016/vincenzo/head/usr.sbin/bhyve Message-ID: <201608051417.u75EHqwZ023504@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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) /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608051417.u75EHqwZ023504>