]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
qlcnic: fix inconsistent lock state
authorAmit Kumar Salecha <amit.salecha@qlogic.com>
Thu, 19 Aug 2010 05:08:22 +0000 (05:08 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 19 Aug 2010 23:52:37 +0000 (16:52 -0700)
Spin_lock(rds_ring->lock) is not required while posting buffers
from qlcnic_open and freeing buffers from qlcnic_down.

Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/qlcnic/qlcnic_init.c

index 75ba744b173c89d0f598d1d61183fd5d9dca1675..08da25895fad17d26c8b8ff83e214c73d6ccbea7 100644 (file)
@@ -136,8 +136,6 @@ void qlcnic_reset_rx_buffers_list(struct qlcnic_adapter *adapter)
        for (ring = 0; ring < adapter->max_rds_rings; ring++) {
                rds_ring = &recv_ctx->rds_rings[ring];
 
-               spin_lock(&rds_ring->lock);
-
                INIT_LIST_HEAD(&rds_ring->free_list);
 
                rx_buf = rds_ring->rx_buf_arr;
@@ -146,8 +144,6 @@ void qlcnic_reset_rx_buffers_list(struct qlcnic_adapter *adapter)
                                        &rds_ring->free_list);
                        rx_buf++;
                }
-
-               spin_unlock(&rds_ring->lock);
        }
 }
 
@@ -1587,8 +1583,6 @@ qlcnic_post_rx_buffers(struct qlcnic_adapter *adapter, u32 ringid,
        int producer, count = 0;
        struct list_head *head;
 
-       spin_lock(&rds_ring->lock);
-
        producer = rds_ring->producer;
 
        head = &rds_ring->free_list;
@@ -1618,7 +1612,6 @@ qlcnic_post_rx_buffers(struct qlcnic_adapter *adapter, u32 ringid,
                writel((producer-1) & (rds_ring->num_desc-1),
                                rds_ring->crb_rcv_producer);
        }
-       spin_unlock(&rds_ring->lock);
 }
 
 static void