Commit f1ed409f authored by Yunbo Yu's avatar Yunbo Yu Committed by David S. Miller

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: default avatarYunbo Yu <yuyunbo519@gmail.com>
Acked-by: default avatarOliver Neukum <oneukum@suse.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f70925bf
...@@ -1492,19 +1492,19 @@ static void cdc_ncm_txpath_bh(struct tasklet_struct *t) ...@@ -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 cdc_ncm_ctx *ctx = from_tasklet(ctx, t, bh);
struct usbnet *dev = ctx->dev; struct usbnet *dev = ctx->dev;
spin_lock_bh(&ctx->mtx); spin_lock(&ctx->mtx);
if (ctx->tx_timer_pending != 0) { if (ctx->tx_timer_pending != 0) {
ctx->tx_timer_pending--; ctx->tx_timer_pending--;
cdc_ncm_tx_timeout_start(ctx); cdc_ncm_tx_timeout_start(ctx);
spin_unlock_bh(&ctx->mtx); spin_unlock(&ctx->mtx);
} else if (dev->net != NULL) { } else if (dev->net != NULL) {
ctx->tx_reason_timeout++; /* count reason for transmitting */ ctx->tx_reason_timeout++; /* count reason for transmitting */
spin_unlock_bh(&ctx->mtx); spin_unlock(&ctx->mtx);
netif_tx_lock_bh(dev->net); netif_tx_lock_bh(dev->net);
usbnet_start_xmit(NULL, dev->net); usbnet_start_xmit(NULL, dev->net);
netif_tx_unlock_bh(dev->net); netif_tx_unlock_bh(dev->net);
} else { } else {
spin_unlock_bh(&ctx->mtx); spin_unlock(&ctx->mtx);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment