circumvent a couple of warnings:
- on line 2550 intentionally overriding a const qualifier - on line 3219 intentionally converting uint64_t to a pointer
This commit is contained in:
parent
b603e09555
commit
3d819cb610
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=257550
@ -2547,7 +2547,7 @@ netmap_ioctl(struct cdev *dev, u_long cmd, caddr_t data,
|
|||||||
}
|
}
|
||||||
if (memflags & NETMAP_MEM_PRIVATE) {
|
if (memflags & NETMAP_MEM_PRIVATE) {
|
||||||
nmr->nr_ringid |= NETMAP_PRIV_MEM;
|
nmr->nr_ringid |= NETMAP_PRIV_MEM;
|
||||||
*(uint32_t *)&nifp->ni_flags |= NI_PRIV_MEM;
|
*(uint32_t *)(uintptr_t)&nifp->ni_flags |= NI_PRIV_MEM;
|
||||||
}
|
}
|
||||||
nmr->nr_offset = netmap_mem_if_offset(na->nm_mem, nifp);
|
nmr->nr_offset = netmap_mem_if_offset(na->nm_mem, nifp);
|
||||||
} while (0);
|
} while (0);
|
||||||
@ -3216,7 +3216,7 @@ nm_bdg_preflush(struct netmap_adapter *na, u_int ring_nr,
|
|||||||
/* this slot goes into a list so initialize the link field */
|
/* this slot goes into a list so initialize the link field */
|
||||||
ft[ft_i].ft_next = NM_FT_NULL;
|
ft[ft_i].ft_next = NM_FT_NULL;
|
||||||
buf = ft[ft_i].ft_buf = (slot->flags & NS_INDIRECT) ?
|
buf = ft[ft_i].ft_buf = (slot->flags & NS_INDIRECT) ?
|
||||||
(void *)slot->ptr : BDG_NMB(na->nm_mem, slot);
|
(void *)(uintptr_t)slot->ptr : BDG_NMB(na->nm_mem, slot);
|
||||||
prefetch(buf);
|
prefetch(buf);
|
||||||
++ft_i;
|
++ft_i;
|
||||||
if (slot->flags & NS_MOREFRAG) {
|
if (slot->flags & NS_MOREFRAG) {
|
||||||
|
Loading…
Reference in New Issue
Block a user