diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-09-15 09:12:21 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-09-15 09:13:19 -0700 |
| commit | 3561373114c8b3359114e2da27259317dc51145a (patch) | |
| tree | 3885239a7987bc96fc9eb3684f77ff4d9e42eef7 /net/can | |
| parent | be461814aa4cb32aae061404b9a6a83ef3895018 (diff) | |
| parent | 7052622fccb1efb850c6b55de477f65d03525a30 (diff) | |
| download | lwn-3561373114c8b3359114e2da27259317dc51145a.tar.gz lwn-3561373114c8b3359114e2da27259317dc51145a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.12 net-next PR.
No conflicts or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/can')
| -rw-r--r-- | net/can/bcm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/can/bcm.c b/net/can/bcm.c index 46d3ec3aa44b..217049fa496e 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -1471,8 +1471,10 @@ static void bcm_notify(struct bcm_sock *bo, unsigned long msg, /* remove device reference, if this is our bound device */ if (bo->bound && bo->ifindex == dev->ifindex) { #if IS_ENABLED(CONFIG_PROC_FS) - if (sock_net(sk)->can.bcmproc_dir && bo->bcm_proc_read) + if (sock_net(sk)->can.bcmproc_dir && bo->bcm_proc_read) { remove_proc_entry(bo->procname, sock_net(sk)->can.bcmproc_dir); + bo->bcm_proc_read = NULL; + } #endif bo->bound = 0; bo->ifindex = 0; |