diff options
| author | Luigi Rizzo <luigi@FreeBSD.org> | 2013-11-02 18:03:21 +0000 |
|---|---|---|
| committer | Luigi Rizzo <luigi@FreeBSD.org> | 2013-11-02 18:03:21 +0000 |
| commit | 3d819cb6102851e77537280d38b51a576b397cb3 (patch) | |
| tree | 21b1a8be43a130c885045750db90b30a232bc2f4 /sys/dev/netmap/netmap.c | |
| parent | b603e095558a55f3ba13bc3a1e3d0747dec19ae2 (diff) | |
circumvent a couple of warnings:
- on line 2550 intentionally overriding a const qualifier
- on line 3219 intentionally converting uint64_t to a pointer
Notes
svn path=/head/; revision=257550
Diffstat (limited to 'sys/dev/netmap/netmap.c')
| -rw-r--r-- | sys/dev/netmap/netmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/netmap/netmap.c b/sys/dev/netmap/netmap.c index 160aedf8be9e..18471d515fe3 100644 --- a/sys/dev/netmap/netmap.c +++ b/sys/dev/netmap/netmap.c @@ -2547,7 +2547,7 @@ netmap_ioctl(struct cdev *dev, u_long cmd, caddr_t data, } if (memflags & NETMAP_MEM_PRIVATE) { 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); } 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 */ ft[ft_i].ft_next = NM_FT_NULL; 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); ++ft_i; if (slot->flags & NS_MOREFRAG) { |