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

Commit 6534770d authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

tools: bpf: fix BTF code added twice to different trees 



commit 38d5d3b3 ("bpf: Introduce BPF_ANNOTATE_KV_PAIR")

added to the bpf and net trees what

commit 92b57121 ("bpf: btf: export btf types and name by offset from lib")

has already added to bpf-next/net-next, but in slightly different
location.  Remove the duplicates (to fix build of libbpf).

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6b431d50

tools/lib/bpf/btf.c

+0 −17
Original line number Original line Diff line number Diff line
@@ -37,14 +37,6 @@ struct btf { 
	int fd;

	int fd;

};

};





static const char *btf_name_by_offset(const struct btf *btf, __u32 offset)

{

	if (offset < btf->hdr->str_len)

		return &btf->strings[offset];

	else

		return NULL;

}



static int btf_add_type(struct btf *btf, struct btf_type *t)

static int btf_add_type(struct btf *btf, struct btf_type *t)

{

{

	if (btf->types_size - btf->nr_types < 2) {

	if (btf->types_size - btf->nr_types < 2) {
@@ -401,12 +393,3 @@ const char *btf__name_by_offset(const struct btf *btf, __u32 offset) 
	else

	else

		return NULL;

		return NULL;

}
 
}
 


const struct btf_type *btf__type_by_id(const struct btf *btf,

				       __u32 type_id)

{

	if (type_id > btf->nr_types)

		return NULL;



	return btf->types[type_id];

}

tools/lib/bpf/btf.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -22,6 +22,5 @@ __s64 btf__resolve_size(const struct btf *btf, __u32 type_id); 
int btf__resolve_type(const struct btf *btf, __u32 type_id);

int btf__resolve_type(const struct btf *btf, __u32 type_id);

int btf__fd(const struct btf *btf);

int btf__fd(const struct btf *btf);

const char *btf__name_by_offset(const struct btf *btf, __u32 offset);

const char *btf__name_by_offset(const struct btf *btf, __u32 offset);

const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 type_id);





#endif
 
#endif