diff options
author | Amit Kumar Salecha <amit.salecha@qlogic.com> | 2010-08-17 16:51:51 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-19 03:28:16 -0400 |
commit | 4be353d5169ef2477814b35fe46734a51dcecd09 (patch) | |
tree | 1981d2a73e355c552cab42deebe533083dda83e1 | |
parent | 0ac820eebe9008094040955d294ef7b33b418413 (diff) |
netxen: fix inconsistent lock state
Spin lock rds_ring->lock is used in poll routine, so other users should
use spin_lock_bh(). While posting rx buffers from netxen_nic_attach,
rds_ring->lock is not required, so cleaning it instead of fixing it by
spin_lock_bh().
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/netxen/netxen_nic_init.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c index c865dda2adf1..cabae7bb1fc6 100644 --- a/drivers/net/netxen/netxen_nic_init.c +++ b/drivers/net/netxen/netxen_nic_init.c | |||
@@ -1805,8 +1805,6 @@ netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ringid, | |||
1805 | netxen_ctx_msg msg = 0; | 1805 | netxen_ctx_msg msg = 0; |
1806 | struct list_head *head; | 1806 | struct list_head *head; |
1807 | 1807 | ||
1808 | spin_lock(&rds_ring->lock); | ||
1809 | |||
1810 | producer = rds_ring->producer; | 1808 | producer = rds_ring->producer; |
1811 | 1809 | ||
1812 | head = &rds_ring->free_list; | 1810 | head = &rds_ring->free_list; |
@@ -1853,8 +1851,6 @@ netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ringid, | |||
1853 | NETXEN_RCV_PRODUCER_OFFSET), msg); | 1851 | NETXEN_RCV_PRODUCER_OFFSET), msg); |
1854 | } | 1852 | } |
1855 | } | 1853 | } |
1856 | |||
1857 | spin_unlock(&rds_ring->lock); | ||
1858 | } | 1854 | } |
1859 | 1855 | ||
1860 | static void | 1856 | static void |