diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2006-02-22 20:45:03 +0100 |
|---|---|---|
| committer | Francois Romieu <romieu@fr.zoreil.com> | 2006-02-23 01:25:26 +0100 |
| commit | 791917deb63c6d8beb3f347ea0911371deff1624 (patch) | |
| tree | 170bc081f03326f75b6b5ccce7d7d1df28a2c833 /drivers/net/sky2.h | |
| parent | [PATCH] sky2: use device iomem to access PCI config (diff) | |
| download | linux-791917deb63c6d8beb3f347ea0911371deff1624.tar.xz linux-791917deb63c6d8beb3f347ea0911371deff1624.zip | |
[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 { struct sky2_hw { void __iomem *regs; struct pci_dev *pdev; - u32 intr_mask; struct net_device *dev[2]; + spinlock_t hw_lock; + u32 intr_mask; int pm_cap; int msi; |