diff options
Diffstat (limited to 'sys/dev/netmap/netmap_freebsd.c')
| -rw-r--r-- | sys/dev/netmap/netmap_freebsd.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/sys/dev/netmap/netmap_freebsd.c b/sys/dev/netmap/netmap_freebsd.c index a4a0124471c0..8cc543d54c2e 100644 --- a/sys/dev/netmap/netmap_freebsd.c +++ b/sys/dev/netmap/netmap_freebsd.c @@ -612,10 +612,6 @@ nm_os_vi_persist(const char *name, if_t *ret) eaddr[5] = (uint8_t)unit; ifp = if_alloc(IFT_ETHER); - if (ifp == NULL) { - nm_prerr("if_alloc failed"); - return ENOMEM; - } if_initname(ifp, name, IF_DUNIT_NONE); if_setflags(ifp, IFF_UP | IFF_SIMPLEX | IFF_MULTICAST); if_setinitfn(ifp, (void *)nm_vi_dummy); @@ -864,16 +860,12 @@ nm_os_pt_memdev_iounmap(struct ptnetmap_memdev *ptn_dev) static int ptn_memdev_probe(device_t dev) { - char desc[256]; - if (pci_get_vendor(dev) != PTNETMAP_PCI_VENDOR_ID) return (ENXIO); if (pci_get_device(dev) != PTNETMAP_PCI_DEVICE_ID) return (ENXIO); - snprintf(desc, sizeof(desc), "%s PCI adapter", - PTNETMAP_MEMDEV_NAME); - device_set_desc_copy(dev, desc); + device_set_descf(dev, "%s PCI adapter", PTNETMAP_MEMDEV_NAME); return (BUS_PROBE_DEFAULT); } @@ -1033,11 +1025,20 @@ netmap_dev_pager_fault(vm_object_t object, vm_ooffset_t offset, return (VM_PAGER_OK); } +static void +netmap_dev_pager_path(void *handle, char *path, size_t len) +{ + struct netmap_vm_handle_t *vmh = handle; + struct cdev *dev = vmh->dev; + + dev_copyname(dev, path, len); +} static struct cdev_pager_ops netmap_cdev_pager_ops = { .cdev_pg_ctor = netmap_dev_pager_ctor, .cdev_pg_dtor = netmap_dev_pager_dtor, .cdev_pg_fault = netmap_dev_pager_fault, + .cdev_pg_path = netmap_dev_pager_path, }; @@ -1405,13 +1406,13 @@ netmap_knwrite(struct knote *kn, long hint) return netmap_knrw(kn, hint, POLLOUT); } -static struct filterops netmap_rfiltops = { +static const struct filterops netmap_rfiltops = { .f_isfd = 1, .f_detach = netmap_knrdetach, .f_event = netmap_knread, }; -static struct filterops netmap_wfiltops = { +static const struct filterops netmap_wfiltops = { .f_isfd = 1, .f_detach = netmap_knwdetach, .f_event = netmap_knwrite, |