From: Willem de Bruijn <willemb@google.com>
Date: Fri, 14 Feb 2025 22:27:00 +0000 (-0500)
Subject: ipv4: initialize inet socket cookies with sockcm_init
X-Git-Tag: v6.15-rc1~160^2~281^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94788792f37902f1f4d417f6f9663831cf7e91fc;p=thirdparty%2Flinux.git

ipv4: initialize inet socket cookies with sockcm_init

Avoid open coding the same logic.

Signed-off-by: Willem de Bruijn <willemb@google.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Link: https://patch.msgid.link/20250214222720.3205500-4-willemdebruijn.kernel@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/include/net/ip.h b/include/net/ip.h
index 305eccdf4ff76..3c4ef5ddad83a 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -94,9 +94,8 @@ static inline void ipcm_init_sk(struct ipcm_cookie *ipcm,
 {
 	ipcm_init(ipcm);
 
-	ipcm->sockc.mark = READ_ONCE(inet->sk.sk_mark);
-	ipcm->sockc.priority = READ_ONCE(inet->sk.sk_priority);
-	ipcm->sockc.tsflags = READ_ONCE(inet->sk.sk_tsflags);
+	sockcm_init(&ipcm->sockc, &inet->sk);
+
 	ipcm->oif = READ_ONCE(inet->sk.sk_bound_dev_if);
 	ipcm->addr = inet->inet_saddr;
 	ipcm->protocol = inet->inet_num;