From 4207fa283f1007ba5bc791e181aa284677dc1cf3 Mon Sep 17 00:00:00 2001 From: "Amit S. Kale" Date: Mon, 18 Dec 2006 05:51:29 -0800 Subject: [PATCH] --- yaml --- r: 45056 b: refs/heads/master c: b0d541dbb940fe8899e3020fcc9ee5a1e2be0306 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/netxen/netxen_nic_main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e0738145581e..b4f90aeba41e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d39073484d6e01d325e6d94a3967ce0e98161a7 +refs/heads/master: b0d541dbb940fe8899e3020fcc9ee5a1e2be0306 diff --git a/trunk/drivers/net/netxen/netxen_nic_main.c b/trunk/drivers/net/netxen/netxen_nic_main.c index d8b1daf0e4b9..f2b3fbc593c6 100644 --- a/trunk/drivers/net/netxen/netxen_nic_main.c +++ b/trunk/drivers/net/netxen/netxen_nic_main.c @@ -446,6 +446,11 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) adapter->port[i] = port; } + writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE)); + netxen_pinit_from_rom(adapter, 0); + udelay(500); + netxen_load_firmware(adapter); + netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE); /* * delay a while to ensure that the Pegs are up & running. * Otherwise, we might see some flaky behaviour. @@ -533,6 +538,8 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev) netxen_nic_stop_all_ports(adapter); /* leave the hw in the same state as reboot */ + netxen_pinit_from_rom(adapter, 0); + writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE)); netxen_load_firmware(adapter); netxen_free_adapter_offload(adapter);