diff options
| author | Matt Macy <mmacy@FreeBSD.org> | 2018-05-18 03:38:17 +0000 |
|---|---|---|
| committer | Matt Macy <mmacy@FreeBSD.org> | 2018-05-18 03:38:17 +0000 |
| commit | cfa866f6a1ba4798cd6d877f0f0e4f45227efb9c (patch) | |
| tree | d793e909a5dea6aaec9de7983ff6b8af700521ec /sys/dev/netmap/netmap_kern.h | |
| parent | 649d7b463a9e41c30dd3b6ec0966bf08b3c49630 (diff) | |
Notes
Diffstat (limited to 'sys/dev/netmap/netmap_kern.h')
| -rw-r--r-- | sys/dev/netmap/netmap_kern.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/netmap/netmap_kern.h b/sys/dev/netmap/netmap_kern.h index 8fc71b8e820ef..862f9a43c5f11 100644 --- a/sys/dev/netmap/netmap_kern.h +++ b/sys/dev/netmap/netmap_kern.h @@ -450,7 +450,7 @@ struct netmap_kring { /* the adapter the owns this kring */ struct netmap_adapter *na; - + /* the adapter that wants to be notified when this kring has * new slots avaialable. This is usually the same as the above, * but wrappers may let it point to themselves @@ -1528,7 +1528,7 @@ int netmap_get_monitor_na(struct nmreq_header *hdr, struct netmap_adapter **na, void netmap_monitor_stop(struct netmap_adapter *na); #else #define netmap_get_monitor_na(hdr, _2, _3, _4) \ - (((struct nmreq_register *)hdr->nr_body)->nr_flags & (NR_MONITOR_TX | NR_MONITOR_RX) ? EOPNOTSUPP : 0) + (((struct nmreq_register *)(uintptr_t)hdr->nr_body)->nr_flags & (NR_MONITOR_TX | NR_MONITOR_RX) ? EOPNOTSUPP : 0) #endif #ifdef CONFIG_NET_NS @@ -1823,7 +1823,7 @@ struct lut_entry { }; #else /* linux & _WIN32 */ /* dma-mapping in linux can assign a buffer a different address - * depending on the device, so we need to have a separate + * depending on the device, so we need to have a separate * physical-address look-up table for each na. * We can still share the vaddrs, though, therefore we split * the lut_entry structure. @@ -2177,7 +2177,7 @@ nm_ptnetmap_host_on(struct netmap_adapter *na) } #else /* !WITH_PTNETMAP_HOST */ #define netmap_get_pt_host_na(hdr, _2, _3, _4) \ - (((struct nmreq_register *)hdr->nr_body)->nr_flags & (NR_PTNETMAP_HOST) ? EOPNOTSUPP : 0) + (((struct nmreq_register *)(uintptr_t)hdr->nr_body)->nr_flags & (NR_PTNETMAP_HOST) ? EOPNOTSUPP : 0) #define ptnetmap_ctl(_1, _2, _3) EINVAL #define nm_ptnetmap_host_on(_1) EINVAL #endif /* !WITH_PTNETMAP_HOST */ |