* [PATCH net] sock: fix error in sock_setsockopt()
@ 2021-07-02 14:41 Eric Dumazet
2021-07-02 14:50 ` Florian Westphal
2021-07-02 20:40 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Eric Dumazet @ 2021-07-02 14:41 UTC (permalink / raw)
To: David S . Miller, Jakub Kicinski
Cc: netdev, Eric Dumazet, Eric Dumazet, John Sperbeck, Paolo Abeni,
Florian Westphal, Mat Martineau
From: Eric Dumazet <edumazet@google.com>
Some tests are failing, John bisected the issue to a recent commit.
sock_set_timestamp() parameters should be :
1) sk
2) optname
3) valbool
Fixes: 371087aa476a ("sock: expose so_timestamp options for mptcp")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Bisected-by: John Sperbeck <jsperbeck@google.com>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Florian Westphal <fw@strlen.de>
Cc: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
net/core/sock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/core/sock.c b/net/core/sock.c
index cad1071122043183217387cd99f4bb5c2bbc051d..1c4b0468bc2c301cecde6e8e0ceaab1631232cb7 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1116,7 +1116,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
case SO_TIMESTAMP_NEW:
case SO_TIMESTAMPNS_OLD:
case SO_TIMESTAMPNS_NEW:
- sock_set_timestamp(sk, valbool, optname);
+ sock_set_timestamp(sk, optname, valbool);
break;
case SO_TIMESTAMPING_NEW:
--
2.32.0.93.g670b81a890-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net] sock: fix error in sock_setsockopt()
2021-07-02 14:41 [PATCH net] sock: fix error in sock_setsockopt() Eric Dumazet
@ 2021-07-02 14:50 ` Florian Westphal
2021-07-02 20:40 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Florian Westphal @ 2021-07-02 14:50 UTC (permalink / raw)
To: Eric Dumazet
Cc: David S . Miller, Jakub Kicinski, netdev, Eric Dumazet,
John Sperbeck, Paolo Abeni, Florian Westphal, Mat Martineau
Eric Dumazet <eric.dumazet@gmail.com> wrote:
> From: Eric Dumazet <edumazet@google.com>
>
> Some tests are failing, John bisected the issue to a recent commit.
>
> sock_set_timestamp() parameters should be :
>
> 1) sk
> 2) optname
> 3) valbool
Oh, right!
Thanks for fixing this.
Reviewed-by: Florian Westphal <fw@strlen.de>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net] sock: fix error in sock_setsockopt()
2021-07-02 14:41 [PATCH net] sock: fix error in sock_setsockopt() Eric Dumazet
2021-07-02 14:50 ` Florian Westphal
@ 2021-07-02 20:40 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-07-02 20:40 UTC (permalink / raw)
To: Eric Dumazet
Cc: davem, kuba, netdev, edumazet, jsperbeck, pabeni, fw, mathew.j.martineau
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
On Fri, 2 Jul 2021 07:41:01 -0700 you wrote:
> From: Eric Dumazet <edumazet@google.com>
>
> Some tests are failing, John bisected the issue to a recent commit.
>
> sock_set_timestamp() parameters should be :
>
> 1) sk
> 2) optname
> 3) valbool
>
> [...]
Here is the summary with links:
- [net] sock: fix error in sock_setsockopt()
https://git.kernel.org/netdev/net/c/81b4a0cc7565
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-02 20:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-02 14:41 [PATCH net] sock: fix error in sock_setsockopt() Eric Dumazet
2021-07-02 14:50 ` Florian Westphal
2021-07-02 20:40 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.