2022-04-21 18:42:26

by Yunbo Yu

Subject: [PATCH] net: cdc-ncm: Move spin_lock_bh() to spin_lock()

It is unnecessary to call spin_lock_bh() for you are already in a tasklet.

Signed-off-by: Yunbo Yu <[email protected]>
---
drivers/net/usb/cdc_ncm.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 15f91d691bba..cdca00c0dc1f 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -1492,19 +1492,19 @@ static void cdc_ncm_txpath_bh(struct tasklet_struct *t)
struct cdc_ncm_ctx *ctx = from_tasklet(ctx, t, bh);
struct usbnet *dev = ctx->dev;

- spin_lock_bh(&ctx->mtx);
+ spin_lock(&ctx->mtx);
if (ctx->tx_timer_pending != 0) {
ctx->tx_timer_pending--;
cdc_ncm_tx_timeout_start(ctx);
- spin_unlock_bh(&ctx->mtx);
+ spin_unlock(&ctx->mtx);
} else if (dev->net != NULL) {
ctx->tx_reason_timeout++; /* count reason for transmitting */
- spin_unlock_bh(&ctx->mtx);
+ spin_unlock(&ctx->mtx);
netif_tx_lock_bh(dev->net);
usbnet_start_xmit(NULL, dev->net);
netif_tx_unlock_bh(dev->net);
} else {
- spin_unlock_bh(&ctx->mtx);
+ spin_unlock(&ctx->mtx);
}
}

--
2.25.1

2022-04-22 18:22:12

by patchwork-bot+netdevbpf

Subject: Re: [PATCH] net: cdc-ncm: Move spin_lock_bh() to spin_lock()

Hello:

This patch was applied to netdev/net-next.git (master)
by David S. Miller <[email protected]>:

On Mon, 18 Apr 2022 22:18:12 +0800 you wrote:
> It is unnecessary to call spin_lock_bh() for you are already in a tasklet.
>
> Signed-off-by: Yunbo Yu <[email protected]>
> ---
> drivers/net/usb/cdc_ncm.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)

Here is the summary with links:
- net: cdc-ncm: Move spin_lock_bh() to spin_lock()
https://git.kernel.org/netdev/net-next/c/f1ed409fb1ee

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html