Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3783d437 authored by Jesper Dangaard Brouer's avatar Jesper Dangaard Brouer Committed by Daniel Borkmann
Browse files

samples/bpf: xdp_fwd rename devmap name to be xdp_tx_ports 



The devmap name 'tx_port' came from a copy-paste from xdp_redirect_map
which only have a single TX port. Change name to xdp_tx_ports
to make it more descriptive.

Signed-off-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Reviewed-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent d9973cec

samples/bpf/xdp_fwd_kern.c

+3 −2
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ 


#define IPV6_FLOWINFO_MASK              cpu_to_be32(0x0FFFFFFF)



struct bpf_map_def SEC("maps") tx_port = {

/* For TX-traffic redirect requires net_device ifindex to be in this devmap */

struct bpf_map_def SEC("maps") xdp_tx_ports = {

	.type = BPF_MAP_TYPE_DEVMAP,

	.key_size = sizeof(int),

	.value_size = sizeof(int),
@@ -117,7 +118,7 @@ static __always_inline int xdp_fwd_flags(struct xdp_md *ctx, u32 flags) 


		memcpy(eth->h_dest, fib_params.dmac, ETH_ALEN);

		memcpy(eth->h_source, fib_params.smac, ETH_ALEN);

		return bpf_redirect_map(&tx_port, fib_params.ifindex, 0);

		return bpf_redirect_map(&xdp_tx_ports, fib_params.ifindex, 0);

	}



	return XDP_PASS;

samples/bpf/xdp_fwd_user.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ int main(int argc, char **argv) 
			return 1;

		}

		map_fd = bpf_map__fd(bpf_object__find_map_by_name(obj,

								  "tx_port"));

							"xdp_tx_ports"));

		if (map_fd < 0) {

			printf("map not found: %s\n", strerror(map_fd));

			return 1;