]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
bnx2fc: Remove bh disable in softirq context
authorNeil Horman <nhorman@tuxdriver.com>
Fri, 9 Mar 2012 22:50:13 +0000 (14:50 -0800)
committerJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 01:36:54 +0000 (09:36 +0800)
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 <nhorman@tuxdriver.com>
Acked-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
(cherry picked from commit fc05ab74b78a9e16b0faa9f0dc3c87f3f30d3231)

Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/scsi/bnx2fc/bnx2fc_fcoe.c

index 5e2ffa24389377d4803be97d0dfbb79ea4f3e35c..8c3818349575a40ba13c27c1d7d615726fb53cad 100644 (file)
@@ -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: