summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Töpel <bjorn.topel@intel.com>2019-05-06 11:24:43 +0200
committerDaniel Borkmann <daniel@iogearbox.net>2019-05-06 11:35:17 +0200
commitd24ed99b3b270c6de8f47c25d709b5f6ef7d3807 (patch)
treebdcca88e477c67b2bd069cd0146c13d8867632fd
parent581b31c36cfc58df603c415ab6f3c795611c0ca1 (diff)
downloadlinux-d24ed99b3b270c6de8f47c25d709b5f6ef7d3807.tar.bz2
libbpf: remove unnecessary cast-to-void
The patches with fixes tags added a cast-to-void in the places when the return value of a function was ignored. This is not common practice in the kernel, and is therefore removed in this patch. Reported-by: Daniel Borkmann <daniel@iogearbox.net> Fixes: 5750902a6e9b ("libbpf: proper XSKMAP cleanup") Fixes: 0e6741f09297 ("libbpf: fix invalid munmap call") Signed-off-by: Björn Töpel <bjorn.topel@intel.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-rw-r--r--tools/lib/bpf/xsk.c24
1 files changed, 10 insertions, 14 deletions
diff --git a/tools/lib/bpf/xsk.c b/tools/lib/bpf/xsk.c
index 525f1cc163b5..a3d1a302bc9c 100644
--- a/tools/lib/bpf/xsk.c
+++ b/tools/lib/bpf/xsk.c
@@ -459,8 +459,8 @@ static void xsk_clear_bpf_maps(struct xsk_socket *xsk)
{
int qid = false;
- (void)bpf_map_update_elem(xsk->qidconf_map_fd, &xsk->queue_id, &qid, 0);
- (void)bpf_map_delete_elem(xsk->xsks_map_fd, &xsk->queue_id);
+ bpf_map_update_elem(xsk->qidconf_map_fd, &xsk->queue_id, &qid, 0);
+ bpf_map_delete_elem(xsk->xsks_map_fd, &xsk->queue_id);
}
static int xsk_set_bpf_maps(struct xsk_socket *xsk)
@@ -686,12 +686,10 @@ int xsk_umem__delete(struct xsk_umem *umem)
optlen = sizeof(off);
err = getsockopt(umem->fd, SOL_XDP, XDP_MMAP_OFFSETS, &off, &optlen);
if (!err) {
- (void)munmap(umem->fill->ring - off.fr.desc,
- off.fr.desc +
- umem->config.fill_size * sizeof(__u64));
- (void)munmap(umem->comp->ring - off.cr.desc,
- off.cr.desc +
- umem->config.comp_size * sizeof(__u64));
+ munmap(umem->fill->ring - off.fr.desc,
+ off.fr.desc + umem->config.fill_size * sizeof(__u64));
+ munmap(umem->comp->ring - off.cr.desc,
+ off.cr.desc + umem->config.comp_size * sizeof(__u64));
}
close(umem->fd);
@@ -717,14 +715,12 @@ void xsk_socket__delete(struct xsk_socket *xsk)
err = getsockopt(xsk->fd, SOL_XDP, XDP_MMAP_OFFSETS, &off, &optlen);
if (!err) {
if (xsk->rx) {
- (void)munmap(xsk->rx->ring - off.rx.desc,
- off.rx.desc +
- xsk->config.rx_size * desc_sz);
+ munmap(xsk->rx->ring - off.rx.desc,
+ off.rx.desc + xsk->config.rx_size * desc_sz);
}
if (xsk->tx) {
- (void)munmap(xsk->tx->ring - off.tx.desc,
- off.tx.desc +
- xsk->config.tx_size * desc_sz);
+ munmap(xsk->tx->ring - off.tx.desc,
+ off.tx.desc + xsk->config.tx_size * desc_sz);
}
}