diff options
| -rw-r--r-- | drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c index 32058614151a..ae4ec7b3bfd3 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | |||
| @@ -135,6 +135,7 @@ void netxen_release_tx_buffers(struct netxen_adapter *adapter) | |||
| 135 | int i, j; | 135 | int i, j; |
| 136 | struct nx_host_tx_ring *tx_ring = adapter->tx_ring; | 136 | struct nx_host_tx_ring *tx_ring = adapter->tx_ring; |
| 137 | 137 | ||
| 138 | spin_lock(&adapter->tx_clean_lock); | ||
| 138 | cmd_buf = tx_ring->cmd_buf_arr; | 139 | cmd_buf = tx_ring->cmd_buf_arr; |
| 139 | for (i = 0; i < tx_ring->num_desc; i++) { | 140 | for (i = 0; i < tx_ring->num_desc; i++) { |
| 140 | buffrag = cmd_buf->frag_array; | 141 | buffrag = cmd_buf->frag_array; |
| @@ -158,6 +159,7 @@ void netxen_release_tx_buffers(struct netxen_adapter *adapter) | |||
| 158 | } | 159 | } |
| 159 | cmd_buf++; | 160 | cmd_buf++; |
| 160 | } | 161 | } |
| 162 | spin_unlock(&adapter->tx_clean_lock); | ||
| 161 | } | 163 | } |
| 162 | 164 | ||
| 163 | void netxen_free_sw_resources(struct netxen_adapter *adapter) | 165 | void netxen_free_sw_resources(struct netxen_adapter *adapter) |
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c index 1159031f885b..5ec5a2b0e989 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | |||
| @@ -1186,7 +1186,6 @@ __netxen_nic_down(struct netxen_adapter *adapter, struct net_device *netdev) | |||
| 1186 | return; | 1186 | return; |
| 1187 | 1187 | ||
| 1188 | smp_mb(); | 1188 | smp_mb(); |
| 1189 | spin_lock(&adapter->tx_clean_lock); | ||
| 1190 | netif_carrier_off(netdev); | 1189 | netif_carrier_off(netdev); |
| 1191 | netif_tx_disable(netdev); | 1190 | netif_tx_disable(netdev); |
| 1192 | 1191 | ||
| @@ -1204,7 +1203,6 @@ __netxen_nic_down(struct netxen_adapter *adapter, struct net_device *netdev) | |||
| 1204 | netxen_napi_disable(adapter); | 1203 | netxen_napi_disable(adapter); |
| 1205 | 1204 | ||
| 1206 | netxen_release_tx_buffers(adapter); | 1205 | netxen_release_tx_buffers(adapter); |
| 1207 | spin_unlock(&adapter->tx_clean_lock); | ||
| 1208 | } | 1206 | } |
| 1209 | 1207 | ||
| 1210 | /* Usage: During suspend and firmware recovery module */ | 1208 | /* Usage: During suspend and firmware recovery module */ |
