| Message ID | 20240823140019.3727643-1-edumazet@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 89683b45f15ca5e0064d6dc1c1bfaa8aacc208f5 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] ipv6: avoid indirect calls for SOL_IP socket options | expand |
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Fri, 23 Aug 2024 14:00:19 +0000 you wrote: > ipv6_setsockopt() can directly call ip_setsockopt() > instead of going through udp_prot.setsockopt() > > ipv6_getsockopt() can directly call ip_getsockopt() > instead of going through udp_prot.getsockopt() > > These indirections predate git history, not sure why they > were there. > > [...] Here is the summary with links: - [net] ipv6: avoid indirect calls for SOL_IP socket options https://git.kernel.org/netdev/net-next/c/89683b45f15c You are awesome, thank you!
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index cd342d5015c6fb36bd03d4f3fcae4a3995ff6097..1e225e6489ea150c641ed0757083591def08dfc1 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -985,7 +985,7 @@ int ipv6_setsockopt(struct sock *sk, int level, int optname, sockptr_t optval, int err; if (level == SOL_IP && sk->sk_type != SOCK_RAW) - return udp_prot.setsockopt(sk, level, optname, optval, optlen); + return ip_setsockopt(sk, level, optname, optval, optlen); if (level != SOL_IPV6) return -ENOPROTOOPT; @@ -1475,7 +1475,7 @@ int ipv6_getsockopt(struct sock *sk, int level, int optname, int err; if (level == SOL_IP && sk->sk_type != SOCK_RAW) - return udp_prot.getsockopt(sk, level, optname, optval, optlen); + return ip_getsockopt(sk, level, optname, optval, optlen); if (level != SOL_IPV6) return -ENOPROTOOPT;
ipv6_setsockopt() can directly call ip_setsockopt() instead of going through udp_prot.setsockopt() ipv6_getsockopt() can directly call ip_getsockopt() instead of going through udp_prot.getsockopt() These indirections predate git history, not sure why they were there. Signed-off-by: Eric Dumazet <edumazet@google.com> --- net/ipv6/ipv6_sockglue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)