summaryrefslogtreecommitdiff
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-08-12 18:44:54 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-08-12 18:44:54 +0200
commit9ca12e50a48c100e3bda3e5152d2181f4a6649e2 (patch)
treeab7fefdcb6fed2fe25a7a256e1fcaea5c5f2dd11 /net/core/dev.c
parent5c4efc60551c0e2a51371ccb0709180a1537f7f8 (diff)
parent7c626ce4bae1ac14f60076d00eafe71af30450ba (diff)
downloadlwn-9ca12e50a48c100e3bda3e5152d2181f4a6649e2.tar.gz
lwn-9ca12e50a48c100e3bda3e5152d2181f4a6649e2.zip
Merge 6.11-rc3 into char-misc-next
We need the char/misc fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 6ea1d20676fb..751d9b70e6ad 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5150,6 +5150,7 @@ int do_xdp_generic(struct bpf_prog *xdp_prog, struct sk_buff **pskb)
bpf_net_ctx_clear(bpf_net_ctx);
return XDP_DROP;
}
+ bpf_net_ctx_clear(bpf_net_ctx);
}
return XDP_PASS;
out_redir: