netxen: stop second phy correctly

This patch fixes bug that doesn't quiesce second port when interface is
brought down, which could lead to unwarranted interrupt during rmmod /
ifdown.

Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/netxen/netxen_nic_niu.c b/drivers/net/netxen/netxen_nic_niu.c
index 5b9e1b300fa..d04ecb77d08 100644
--- a/drivers/net/netxen/netxen_nic_niu.c
+++ b/drivers/net/netxen/netxen_nic_niu.c
@@ -736,12 +736,12 @@ int netxen_niu_disable_xg_port(struct netxen_adapter *adapter)
         __u32 mac_cfg;
         u32 port = physical_port[adapter->portnum];
 
-        if (port != 0)
+        if (port > NETXEN_NIU_MAX_XG_PORTS)
                 return -EINVAL;
+
         mac_cfg = 0;
-        netxen_xg_soft_reset(mac_cfg);
-        if (netxen_nic_hw_write_wx(adapter, NETXEN_NIU_XGE_CONFIG_0,
-                                   &mac_cfg, 4))
+        if (netxen_nic_hw_write_wx(adapter,
+                NETXEN_NIU_XGE_CONFIG_0 + (0x10000 * port), &mac_cfg, 4))
                 return -EIO;
         return 0;
 }