summaryrefslogtreecommitdiffstats
path: root/net/caif
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2023-02-17 12:06:39 +0100
committerDavid S. Miller <davem@davemloft.net>2023-02-17 12:06:39 +0100
commit675f176b4dcc2b75adbcea7ba0e9a649527f53bd (patch)
treedc5eea870c19b405bb6558964e5367bb6c9205c5 /net/caif
parentMerge branch 'mlx5-next' of https://git.kernel.org/pub/scm/linux/kernel/git/m... (diff)
parentMerge tag 'drm-fixes-2023-02-17' of git://anongit.freedesktop.org/drm/drm (diff)
downloadlinux-675f176b4dcc2b75adbcea7ba0e9a649527f53bd.tar.xz
linux-675f176b4dcc2b75adbcea7ba0e9a649527f53bd.zip
Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
Some of the devlink bits were tricky, but I think I got it right. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/caif')
-rw-r--r--net/caif/caif_socket.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index 1f2c1d7b90e2..4eebcc66c19a 100644
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -1011,6 +1011,7 @@ static void caif_sock_destructor(struct sock *sk)
return;
}
sk_stream_kill_queues(&cf_sk->sk);
+ WARN_ON_ONCE(sk->sk_forward_alloc);
caif_free_client(&cf_sk->layer);
}