diff options
| author |   Amit Kumar Salecha <amit.salecha@qlogic.com> | 2010-03-26 00:30:08 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-03-26 11:49:21 -0700 |
| commit | 77c553900c58c3e4f475e233ad4ff6aeb282deb4 (patch) | |
| tree | 515491f5037abb46476b551c10f7926b4851983a /drivers | |
| parent | netxen: fix bios version calculation (diff) | |
| download | linux-dev-77c553900c58c3e4f475e233ad4ff6aeb282deb4.tar.xz linux-dev-77c553900c58c3e4f475e233ad4ff6aeb282deb4.zip | |
netxen: fix warning in ioaddr for NX3031 chip
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
crb_intr_mask/crb_sts_consumer is predefined for NX2031 not for
NX3031. For NX3031, these values get defined in rx context creation.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_ctx.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/netxen/netxen_nic_ctx.c b/drivers/net/netxen/netxen_nic_ctx.c index 2a8ef5fc9663..f26e54716c88 100644 --- a/drivers/net/netxen/netxen_nic_ctx.c +++ b/drivers/net/netxen/netxen_nic_ctx.c @@ -669,13 +669,15 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter) } sds_ring->desc_head = (struct status_desc *)addr; - sds_ring->crb_sts_consumer = - netxen_get_ioaddr(adapter, - recv_crb_registers[port].crb_sts_consumer[ring]); + if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) { + sds_ring->crb_sts_consumer = + netxen_get_ioaddr(adapter, + recv_crb_registers[port].crb_sts_consumer[ring]); - sds_ring->crb_intr_mask = - netxen_get_ioaddr(adapter, - recv_crb_registers[port].sw_int_mask[ring]); + sds_ring->crb_intr_mask = + netxen_get_ioaddr(adapter, + recv_crb_registers[port].sw_int_mask[ring]); + } } |