From 89d5ca7c1e26d816cf94e3c7697d1be5eb1f79d4 Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Fri, 9 Mar 2012 14:50:13 -0800 Subject: [PATCH] bnx2fc: Remove bh disable in softirq context As with the fcoe sw transport, the bnx2fc packet handler function runs only in softirq context. Theres no need to disable bottom halves here Signed-off-by: Neil Horman Acked-by: Bhanu Prakash Gollapudi Signed-off-by: Robert Love Signed-off-by: James Bottomley (cherry picked from commit fc05ab74b78a9e16b0faa9f0dc3c87f3f30d3231) Signed-off-by: Joe Jin --- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c index 5e2ffa243893..8c3818349575 100644 --- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c +++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c @@ -441,13 +441,13 @@ static int bnx2fc_rcv(struct sk_buff *skb, struct net_device *dev, fr->ptype = ptype; bg = &bnx2fc_global; - spin_lock_bh(&bg->fcoe_rx_list.lock); + spin_lock(&bg->fcoe_rx_list.lock); __skb_queue_tail(&bg->fcoe_rx_list, skb); if (bg->fcoe_rx_list.qlen == 1) wake_up_process(bg->thread); - spin_unlock_bh(&bg->fcoe_rx_list.lock); + spin_unlock(&bg->fcoe_rx_list.lock); return 0; err: -- 2.50.1