Skip to contentSkip to conversation

bpf, tcx: Get rid of tcx_link_const

PATCH Applied Daniel Borkmann 2 participants 2 messages Oct 23, 2023

Subsystems (3)
lore
Share & tools
lore

Daniel Borkmann

author maintainer
#0 lore raw

PATCH 1/1 bpf, tcx: Get rid of tcx_link_const

Small clean up to get rid of the extra tcx_link_const() and only retain the tcx_link().

---
 include/net/tcx.h | 7 +------
 kernel/bpf/tcx.c  | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)
include/net/tcx.h +1 -6
index 264f147953ba..04be9377785d 100644
@@ -38,16 +38,11 @@ static inline struct tcx_entry *tcx_entry(struct bpf_mprog_entry *entry)
 	return container_of(bundle, struct tcx_entry, bundle);
 }
 
-static inline struct tcx_link *tcx_link(struct bpf_link *link)
+static inline struct tcx_link *tcx_link(const struct bpf_link *link)
 {
 	return container_of(link, struct tcx_link, link);
 }
 
-static inline const struct tcx_link *tcx_link_const(const struct bpf_link *link)
-{
-	return tcx_link((struct bpf_link *)link);
-}
-
 void tcx_inc(void);
 void tcx_dec(void);
 
kernel/bpf/tcx.c +2 -2
index 1338a13a8b64..2e4885e7781f 100644
@@ -250,7 +250,7 @@ static void tcx_link_dealloc(struct bpf_link *link)
 
 static void tcx_link_fdinfo(const struct bpf_link *link, struct seq_file *seq)
 {
-	const struct tcx_link *tcx = tcx_link_const(link);
+	const struct tcx_link *tcx = tcx_link(link);
 	u32 ifindex = 0;
 
 	rtnl_lock();
@@ -267,7 +267,7 @@ static void tcx_link_fdinfo(const struct bpf_link *link, struct seq_file *seq)
 static int tcx_link_fill_info(const struct bpf_link *link,
 			      struct bpf_link_info *info)
 {
-	const struct tcx_link *tcx = tcx_link_const(link);
+	const struct tcx_link *tcx = tcx_link(link);
 	u32 ifindex = 0;
 
 	rtnl_lock();
Signature · 1 line
2.34.1
#1 lore raw
This patch was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:

Hello:

This patch was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:

Quoted 8 lines · On Mon, 23 Oct 2023 20:50:15 +0200 you wrote:

Small clean up to get rid of the extra tcx_link_const() and only retain the tcx_link().

---
 include/net/tcx.h | 7 +------
 kernel/bpf/tcx.c  | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

Here is the summary with links:
- [bpf-next] bpf, tcx: Get rid of tcx_link_const

    https://git.kernel.org/bpf/bpf-next/c/b63dadd6f975

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html