Action disabled: source

netxen: fix warning in ioaddr for NX3031 chip

This change “netxen: fix warning in ioaddr for NX3031 chip” (commit 77c5539) in Linux kernel is authored by Amit Kumar Salecha <amit.salecha [at] qlogic.com> on Fri Mar 26 00:30:08 2010 +0000.

Description of "netxen: fix warning in ioaddr for NX3031 chip"

The change “netxen: fix warning in ioaddr for NX3031 chip” introduces changes as follows.

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>

Linux kernel releases containing commit 77c5539

The Linux kernel releases containing this commit are as follows.

Linux kernel code changes from "netxen: fix warning in ioaddr for NX3031 chip"

There are 14 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/net/netxen/netxen_nic_ctx.c | 14 ++++++++------
 1 file 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]);
+		}
 	}
 
 

The commit for this change in Linux stable tree is 77c5539 (patch).

Last modified: 2020/02/10