diff options
| author | Dhananjay Phadke <dhananjay@netxen.com> | 2009-07-26 20:07:36 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-27 10:54:18 -0700 |
| commit | 68b3cae0824b98d1f469a80cc65dcaab81771f45 (patch) | |
| tree | 0d9708de0a4e5f2f1d1ac8dd633822e52b836406 /drivers/net/netxen/netxen_nic_init.c | |
| parent | 663a31ce5bbef2d14fa325023e48bf02b4249f27 (diff) | |
| download | op-kernel-dev-68b3cae0824b98d1f469a80cc65dcaab81771f45.zip op-kernel-dev-68b3cae0824b98d1f469a80cc65dcaab81771f45.tar.gz | |
netxen: refresh firmware info after reset
o move dma mask update to netxen_start_firmware() so that
if firmware changes across suspend (e.g. file -> flash)
it reflects right dma mask.
o re-read firmware capabilities after firmware reset.
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_init.c')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_init.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c index 5d3343e..847f78b 100644 --- a/drivers/net/netxen/netxen_nic_init.c +++ b/drivers/net/netxen/netxen_nic_init.c @@ -1083,10 +1083,6 @@ int netxen_init_firmware(struct netxen_adapter *adapter) NXWR32(adapter, CRB_MPORT_MODE, MPORT_MULTI_FUNCTION_MODE); NXWR32(adapter, CRB_CMDPEG_STATE, PHAN_INITIALIZE_ACK); - if (adapter->fw_version >= NETXEN_VERSION_CODE(4, 0, 222)) { - adapter->capabilities = NXRD32(adapter, CRB_FW_CAPABILITIES_1); - } - return err; } |
