diff options
author | Stephen Hemminger <shemminger@osdl.org> | 2006-02-22 14:45:03 -0500 |
---|---|---|
committer | Francois Romieu <romieu@fr.zoreil.com> | 2006-02-22 19:25:26 -0500 |
commit | 791917deb63c6d8beb3f347ea0911371deff1624 (patch) | |
tree | 170bc081f03326f75b6b5ccce7d7d1df28a2c833 /drivers/net/sky2.h | |
parent | 56a645cc1bc16ab33b33a3e0854a46c5d2c864f3 (diff) |
[PATCH] sky2: close race on IRQ mask update.
Need to avoid race in updating IRQ mask. This can probably be replaced
smarter use of the interrupt control registers (if/when chipset
docs are available).
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Diffstat (limited to 'drivers/net/sky2.h')
-rw-r--r-- | drivers/net/sky2.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h index 9e40766150b4..3edb98075e0a 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h | |||
@@ -1876,8 +1876,9 @@ struct sky2_port { | |||
1876 | struct sky2_hw { | 1876 | struct sky2_hw { |
1877 | void __iomem *regs; | 1877 | void __iomem *regs; |
1878 | struct pci_dev *pdev; | 1878 | struct pci_dev *pdev; |
1879 | u32 intr_mask; | ||
1880 | struct net_device *dev[2]; | 1879 | struct net_device *dev[2]; |
1880 | spinlock_t hw_lock; | ||
1881 | u32 intr_mask; | ||
1881 | 1882 | ||
1882 | int pm_cap; | 1883 | int pm_cap; |
1883 | int msi; | 1884 | int msi; |