aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sky2.h
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-02-22 11:45:03 -0800
committerFrancois Romieu <romieu@fr.zoreil.com>2006-02-23 01:25:26 +0100
commit791917deb63c6d8beb3f347ea0911371deff1624 (patch)
tree170bc081f03326f75b6b5ccce7d7d1df28a2c833 /drivers/net/sky2.h
parent56a645cc1bc16ab33b33a3e0854a46c5d2c864f3 (diff)
downloadkernel_samsung_smdk4412-791917deb63c6d8beb3f347ea0911371deff1624.zip
kernel_samsung_smdk4412-791917deb63c6d8beb3f347ea0911371deff1624.tar.gz
kernel_samsung_smdk4412-791917deb63c6d8beb3f347ea0911371deff1624.tar.bz2
[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.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 9e40766..3edb980 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;