netxen: firmware download improvements

o set port mode after resetting device.
o prefer cut-through firmware (doesn't require on-card memory).
o load flashed firmware if newer.

Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 0ce7cf0dc99c..dfd66eaed1aa 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -676,16 +676,17 @@ netxen_start_firmware(struct netxen_adapter *adapter)
                 return err;
         }
 
-        if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
-                netxen_set_port_mode(adapter);
-
         if (first_boot != 0x55555555) {
                 adapter->pci_write_normalize(adapter,
                                         CRB_CMDPEG_STATE, 0);
                 netxen_pinit_from_rom(adapter, 0);
                 msleep(1);
         }
+
         netxen_nic_reg_write(adapter, CRB_DMA_SHIFT, 0x55555555);
+        if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
+                netxen_set_port_mode(adapter);
+
         netxen_load_firmware(adapter);
 
         if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {