diff options
| author | Dhananjay Phadke | 2009-10-13 07:31:44 +0200 |
|---|---|---|
| committer | David S. Miller | 2009-10-13 20:48:21 +0200 |
| commit | f03b0ebd8e7132bd9adb41348070813feb280300 (patch) | |
| tree | c7606724b4dcd84857980797c9d948f00cbeb185 /drivers/net/netxen/netxen_nic_main.c | |
| parent | netxen: annotate register windowing code (diff) | |
| download | kernel-qcow2-linux-f03b0ebd8e7132bd9adb41348070813feb280300.tar.gz kernel-qcow2-linux-f03b0ebd8e7132bd9adb41348070813feb280300.tar.xz kernel-qcow2-linux-f03b0ebd8e7132bd9adb41348070813feb280300.zip | |
netxen: separate register and memory access lock
Since register and onboard memory access has separate
window registers, they need not be kept under same lock.
Also, memory is always accessed from process context
(mostly for firmware init and diagnostic tools).
Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_main.c')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 6695e5473027..38529ee55be9 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -1240,7 +1240,9 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) revision_id = pdev->revision; adapter->ahw.revision_id = revision_id; - rwlock_init(&adapter->adapter_lock); + rwlock_init(&adapter->ahw.crb_lock); + spin_lock_init(&adapter->ahw.mem_lock); + spin_lock_init(&adapter->tx_clean_lock); INIT_LIST_HEAD(&adapter->mac_list); |