3 files changed, 15 insertions, 14 deletions

diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h
index 3276866b17e2..d72f8f8fcb50 100644
--- a/drivers/net/netxen/netxen_nic_hdr.h
+++ b/drivers/net/netxen/netxen_nic_hdr.h
@@ -649,9 +649,11 @@ enum {
 #define PCIX_INT_VECTOR         (0x10100)
 #define PCIX_INT_MASK           (0x10104)
 
-#define PCIX_MN_WINDOW          (0x10200)
+#define PCIX_MN_WINDOW_F0       (0x10200)
+#define PCIX_MN_WINDOW(_f)      (PCIX_MN_WINDOW_F0 + (0x20 * (_f)))
 #define PCIX_MS_WINDOW          (0x10204)
-#define PCIX_SN_WINDOW          (0x10208)
+#define PCIX_SN_WINDOW_F0       (0x10208)
+#define PCIX_SN_WINDOW(_f)      (PCIX_SN_WINDOW_F0 + (0x20 * (_f)))
 #define PCIX_CRB_WINDOW         (0x10210)
 #define PCIX_CRB_WINDOW_F0      (0x10210)
 #define PCIX_CRB_WINDOW_F1      (0x10230)
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index aac15421bd1e..a7b8d7f23259 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -904,11 +904,11 @@ netxen_nic_pci_set_window(struct netxen_adapter *adapter,
                         ddr_mn_window = window;
                         writel(window, PCI_OFFSET_SECOND_RANGE(adapter,
                                                                NETXEN_PCIX_PH_REG
-                                                               (PCIX_MN_WINDOW)));
+                                                               (PCIX_MN_WINDOW(adapter->ahw.pci_func))));
                         /* MUST make sure window is set before we forge on... */
                         readl(PCI_OFFSET_SECOND_RANGE(adapter,
                                                       NETXEN_PCIX_PH_REG
-                                                      (PCIX_MN_WINDOW)));
+                                                      (PCIX_MN_WINDOW(adapter->ahw.pci_func))));
                 }
                 addr -= (window * NETXEN_WINDOW_ONE);
                 addr += NETXEN_PCI_DDR_NET;
@@ -929,11 +929,11 @@ netxen_nic_pci_set_window(struct netxen_adapter *adapter,
                         writel((window << 22),
                                PCI_OFFSET_SECOND_RANGE(adapter,
                                                        NETXEN_PCIX_PH_REG
-                                                       (PCIX_SN_WINDOW)));
+                                                       (PCIX_SN_WINDOW(adapter->ahw.pci_func))));
                         /* MUST make sure window is set before we forge on... */
                         readl(PCI_OFFSET_SECOND_RANGE(adapter,
                                                       NETXEN_PCIX_PH_REG
-                                                      (PCIX_SN_WINDOW)));
+                                                      (PCIX_SN_WINDOW(adapter->ahw.pci_func))));
                 }
                 addr -= (window * 0x400000);
                 addr += NETXEN_PCI_QDR_NET;
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index ab85fb709cc9..3122d0101638 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -746,9 +746,6 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
 
         netxen_nic_disable_int(adapter);
 
-        if (adapter->irq)
-                free_irq(adapter->irq, adapter);
-
         if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) {
                 init_firmware_done++;
                 netxen_free_hw_resources(adapter);
@@ -772,13 +769,8 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
                 }
         }
 
-        if (adapter->flags & NETXEN_NIC_MSI_ENABLED)
-                pci_disable_msi(pdev);
-
         vfree(adapter->cmd_buf_arr);
 
-        pci_disable_device(pdev);
-
         if (adapter->portnum == 0) {
                 if (init_firmware_done) {
                         i = 100;
@@ -829,12 +821,19 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
                 }
         }
 
+        if (adapter->irq)
+                free_irq(adapter->irq, adapter);
+
+        if (adapter->flags & NETXEN_NIC_MSI_ENABLED)
+                pci_disable_msi(pdev);
+
         iounmap(adapter->ahw.db_base);
         iounmap(adapter->ahw.pci_base0);
         iounmap(adapter->ahw.pci_base1);
         iounmap(adapter->ahw.pci_base2);
 
         pci_release_regions(pdev);
+        pci_disable_device(pdev);
         pci_set_drvdata(pdev, NULL);
 
         free_netdev(netdev);