summaryrefslogtreecommitdiff
path: root/net/ipv4/tcp_bpf.c
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2022-06-23 22:33:24 +0300
committerJakub Kicinski <kuba@kernel.org>2022-06-23 22:33:24 +0300
commit93817be8b62c7fa1f1bdc3e8c037a73a60026be9 (patch)
tree873c207abc783edb4ead73b2b3a8a9b105f94420 /net/ipv4/tcp_bpf.c
parentccb9bc1dfa444e3541622ccfff135e83d2a569d1 (diff)
parent399bd66e219e331976fe6fa6ab81a023c0c97870 (diff)
downloadlinux-93817be8b62c7fa1f1bdc3e8c037a73a60026be9.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv4/tcp_bpf.c')
-rw-r--r--net/ipv4/tcp_bpf.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c
index 38550bb1b90b..a1626afe87a1 100644
--- a/net/ipv4/tcp_bpf.c
+++ b/net/ipv4/tcp_bpf.c
@@ -612,9 +612,6 @@ int tcp_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore)
return 0;
}
- if (inet_csk_has_ulp(sk))
- return -EINVAL;
-
if (sk->sk_family == AF_INET6) {
if (tcp_bpf_assert_proto_ops(psock->sk_proto))
return -EINVAL;