]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
netxen: fix caching window register
authorAmit Kumar Salecha <amit.salecha@qlogic.com>
Sun, 13 Jun 2010 23:39:05 +0000 (23:39 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Jun 2010 01:15:27 +0000 (18:15 -0700)
CRB window register is not per pci-func for NX3031,
so caching can result in incorrect values.

Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/netxen/netxen_nic_hw.c

index 5c496f8d7c497f16c5a17fe7398794efdca550b3..29d7b93d0493be12e4a5def185282371b5cd400d 100644 (file)
@@ -1159,9 +1159,6 @@ netxen_nic_pci_set_crbwindow_2M(struct netxen_adapter *adapter, ulong off)
 
        window = CRB_HI(off);
 
-       if (adapter->ahw.crb_win == window)
-               return;
-
        writel(window, addr);
        if (readl(addr) != window) {
                if (printk_ratelimit())
@@ -1169,7 +1166,6 @@ netxen_nic_pci_set_crbwindow_2M(struct netxen_adapter *adapter, ulong off)
                                "failed to set CRB window to %d off 0x%lx\n",
                                window, off);
        }
-       adapter->ahw.crb_win = window;
 }
 
 static void __iomem *