Skip to contentSkip to conversation

sock: fix error in sock_setsockopt()

PATCH Applied Eric Dumazet 3 participants 3 messages Jul 2, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sock: fix error in sock_setsockopt()

From: Eric Dumazet <[email protected]>

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")
Cc Paolo Abeni <[email protected]>
Cc Florian Westphal <[email protected]>
Cc Mat Martineau <[email protected]>
---
 net/core/sock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/sock.c +1 -1
index cad1071122043183217387cd99f4bb5c2bbc051d..1c4b0468bc2c301cecde6e8e0ceaab1631232cb7 100644
@@ -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:
Signature · 1 line
2.32.0.93.g670b81a890-goog
#2 lore raw
In reply to Eric Dumazet
This patch was applied to netdev/net.git (refs/heads/master):

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

Quoted 11 lines · On Fri, 2 Jul 2021 07:41:01 -0700 you wrote:

From: Eric Dumazet <[email protected]>

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