diff options
author | Dhananjay Phadke <dhananjay@netxen.com> | 2009-07-26 16:07:36 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-27 13:54:18 -0400 |
commit | 68b3cae0824b98d1f469a80cc65dcaab81771f45 (patch) | |
tree | 0d9708de0a4e5f2f1d1ac8dd633822e52b836406 /drivers/net/netxen/netxen_nic_init.c | |
parent | 663a31ce5bbef2d14fa325023e48bf02b4249f27 (diff) |
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 5d3343ef3d86..847f78b18688 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) | |||
1083 | NXWR32(adapter, CRB_MPORT_MODE, MPORT_MULTI_FUNCTION_MODE); | 1083 | NXWR32(adapter, CRB_MPORT_MODE, MPORT_MULTI_FUNCTION_MODE); |
1084 | NXWR32(adapter, CRB_CMDPEG_STATE, PHAN_INITIALIZE_ACK); | 1084 | NXWR32(adapter, CRB_CMDPEG_STATE, PHAN_INITIALIZE_ACK); |
1085 | 1085 | ||
1086 | if (adapter->fw_version >= NETXEN_VERSION_CODE(4, 0, 222)) { | ||
1087 | adapter->capabilities = NXRD32(adapter, CRB_FW_CAPABILITIES_1); | ||
1088 | } | ||
1089 | |||
1090 | return err; | 1086 | return err; |
1091 | } | 1087 | } |
1092 | 1088 | ||