aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/netmap/if_ptnet.c3
-rw-r--r--sys/dev/netmap/netmap_kern.h1
-rw-r--r--sys/net/netmap_virt.h4
3 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/netmap/if_ptnet.c b/sys/dev/netmap/if_ptnet.c
index ccf008d4451b..38149ac2650c 100644
--- a/sys/dev/netmap/if_ptnet.c
+++ b/sys/dev/netmap/if_ptnet.c
@@ -87,6 +87,8 @@
#include <dev/netmap/netmap_mem2.h>
#include <dev/virtio/network/virtio_net.h>
+#ifdef WITH_PTNETMAP
+
#ifndef INET
#error "INET not defined, cannot support offloadings"
#endif
@@ -1993,3 +1995,4 @@ ptnet_poll(if_t ifp, enum poll_cmd cmd, int budget)
return count;
}
#endif /* DEVICE_POLLING */
+#endif /* WITH_PTNETMAP */
diff --git a/sys/dev/netmap/netmap_kern.h b/sys/dev/netmap/netmap_kern.h
index 3748f81cbb5f..690d45def356 100644
--- a/sys/dev/netmap/netmap_kern.h
+++ b/sys/dev/netmap/netmap_kern.h
@@ -76,7 +76,6 @@
#define WITH_PIPES
#define WITH_MONITOR
#define WITH_GENERIC
-#define WITH_PTNETMAP /* ptnetmap guest support */
#define WITH_EXTMEM
#define WITH_NMNULL
#endif
diff --git a/sys/net/netmap_virt.h b/sys/net/netmap_virt.h
index 07e551aff009..12c2565a734a 100644
--- a/sys/net/netmap_virt.h
+++ b/sys/net/netmap_virt.h
@@ -44,8 +44,8 @@
/* PCI identifiers and PCI BARs for ptnetmap-memdev and ptnet. */
#define PTNETMAP_MEMDEV_NAME "ptnetmap-memdev"
#define PTNETMAP_PCI_VENDOR_ID 0x1b36 /* QEMU virtual devices */
-#define PTNETMAP_PCI_DEVICE_ID 0x000c /* memory device */
-#define PTNETMAP_PCI_NETIF_ID 0x000d /* ptnet network interface */
+#define PTNETMAP_PCI_DEVICE_ID 0xcccc /* memory device */
+#define PTNETMAP_PCI_NETIF_ID 0xcccd /* ptnet network interface */
#define PTNETMAP_IO_PCI_BAR 0
#define PTNETMAP_MEM_PCI_BAR 1
#define PTNETMAP_MSIX_PCI_BAR 2