diff options
author | Dhananjay Phadke <dhananjay@netxen.com> | 2009-04-07 18:50:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-04-08 18:58:25 -0400 |
commit | 1b1f789818c6be9437cfe199932ee13faafca60f (patch) | |
tree | bcaef3319a13e5f6a57bca983de97921e612c3b0 /drivers/net/netxen/netxen_nic_ctx.c | |
parent | e98e3350c03af4187e1d5fe007c7b460e378990c (diff) |
netxen: refactor netxen_adapter
Rearrange members to align them at right offset.
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_ctx.c')
-rw-r--r-- | drivers/net/netxen/netxen_nic_ctx.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/netxen/netxen_nic_ctx.c b/drivers/net/netxen/netxen_nic_ctx.c index 9234473bc08a..73f6debacf9c 100644 --- a/drivers/net/netxen/netxen_nic_ctx.c +++ b/drivers/net/netxen/netxen_nic_ctx.c | |||
@@ -624,9 +624,6 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter) | |||
624 | 624 | ||
625 | 625 | ||
626 | if (adapter->fw_major >= 4) { | 626 | if (adapter->fw_major >= 4) { |
627 | adapter->intr_scheme = INTR_SCHEME_PERPORT; | ||
628 | adapter->msi_mode = MSI_MODE_MULTIFUNC; | ||
629 | |||
630 | err = nx_fw_cmd_create_rx_ctx(adapter); | 627 | err = nx_fw_cmd_create_rx_ctx(adapter); |
631 | if (err) | 628 | if (err) |
632 | goto err_out_free; | 629 | goto err_out_free; |
@@ -638,10 +635,6 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter) | |||
638 | sds_ring->crb_sts_consumer = | 635 | sds_ring->crb_sts_consumer = |
639 | recv_crb_registers[adapter->portnum].crb_sts_consumer; | 636 | recv_crb_registers[adapter->portnum].crb_sts_consumer; |
640 | 637 | ||
641 | adapter->intr_scheme = adapter->pci_read_normalize(adapter, | ||
642 | CRB_NIC_CAPABILITIES_FW); | ||
643 | adapter->msi_mode = adapter->pci_read_normalize(adapter, | ||
644 | CRB_NIC_MSI_MODE_FW); | ||
645 | recv_ctx->sds_rings[0].crb_intr_mask = | 638 | recv_ctx->sds_rings[0].crb_intr_mask = |
646 | sw_int_mask[adapter->portnum]; | 639 | sw_int_mask[adapter->portnum]; |
647 | 640 | ||