diff options
| author |   Dhananjay Phadke <dhananjay@netxen.com> | 2009-10-13 05:31:44 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-10-13 11:48:21 -0700 |
| commit | f03b0ebd8e7132bd9adb41348070813feb280300 (patch) | |
| tree | c7606724b4dcd84857980797c9d948f00cbeb185 /drivers/net/netxen/netxen_nic.h | |
| parent | netxen: annotate register windowing code (diff) | |
| download | linux-dev-f03b0ebd8e7132bd9adb41348070813feb280300.tar.xz linux-dev-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.h')
| -rw-r--r-- | drivers/net/netxen/netxen_nic.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h index 2a42132b9799..1047609ef51b 100644 --- a/drivers/net/netxen/netxen_nic.h +++ b/drivers/net/netxen/netxen_nic.h @@ -551,6 +551,9 @@ struct netxen_hardware_context { u32 ocm_win; u32 crb_win; + rwlock_t crb_lock; + spinlock_t mem_lock; + u8 cut_through; u8 revision_id; u8 pci_func; @@ -1115,8 +1118,6 @@ struct netxen_adapter { struct pci_dev *pdev; struct list_head mac_list; - rwlock_t adapter_lock; - spinlock_t tx_clean_lock; u16 num_txd; |