diff options
| author | Maxime Ripard <mripard@kernel.org> | 2026-03-30 11:05:36 +0300 |
|---|---|---|
| committer | Maxime Ripard <mripard@kernel.org> | 2026-03-30 11:05:36 +0300 |
| commit | 6fdfd24017756bbe27ccc786051e97f3bf0c3d62 (patch) | |
| tree | 2f826d4f094a9edce9872d284172b6c5d3f7c063 /net/mptcp/pm_kernel.c | |
| parent | 3bce3fdd1ff2ba242f76ab66659fff27207299f1 (diff) | |
| parent | 7aaa8047eafd0bd628065b15757d9b48c5f9c07d (diff) | |
| download | linux-6fdfd24017756bbe27ccc786051e97f3bf0c3d62.tar.xz | |
Merge drm/drm-fixes into drm-misc-next-fixes
Boris needs 7.0-rc6 for a shmem helper fix.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'net/mptcp/pm_kernel.c')
| -rw-r--r-- | net/mptcp/pm_kernel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mptcp/pm_kernel.c b/net/mptcp/pm_kernel.c index b2b9df43960e..82e59f9c6dd9 100644 --- a/net/mptcp/pm_kernel.c +++ b/net/mptcp/pm_kernel.c @@ -838,7 +838,7 @@ static struct lock_class_key mptcp_keys[2]; static int mptcp_pm_nl_create_listen_socket(struct sock *sk, struct mptcp_pm_addr_entry *entry) { - bool is_ipv6 = sk->sk_family == AF_INET6; + bool is_ipv6 = entry->addr.family == AF_INET6; int addrlen = sizeof(struct sockaddr_in); struct sockaddr_storage addr; struct sock *newsk, *ssk; |