summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell/sky2.h
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2011-11-17 15:37:35 +0100
committerDavid S. Miller <davem@davemloft.net>2011-11-18 03:43:57 +0100
commit282edcece39e08d02c22492d593e4b9b94a65dff (patch)
treea0d0c9816a5ef76bc637a573e382379600016e09 /drivers/net/ethernet/marvell/sky2.h
parentsky2: enforce minimum ring size (diff)
downloadlinux-282edcece39e08d02c22492d593e4b9b94a65dff.tar.xz
linux-282edcece39e08d02c22492d593e4b9b94a65dff.zip
sky2: fix hang in napi_disable
If IRQ was never initialized, then calling napi_disable() would hang. Add more bookkeeping to track whether IRQ was ever initialized. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell/sky2.h')
-rw-r--r--drivers/net/ethernet/marvell/sky2.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/marvell/sky2.h b/drivers/net/ethernet/marvell/sky2.h
index 0af31b8b5f10..ff6f58bf822a 100644
--- a/drivers/net/ethernet/marvell/sky2.h
+++ b/drivers/net/ethernet/marvell/sky2.h
@@ -2287,6 +2287,7 @@ struct sky2_hw {
#define SKY2_HW_RSS_BROKEN 0x00000100
#define SKY2_HW_VLAN_BROKEN 0x00000200
#define SKY2_HW_RSS_CHKSUM 0x00000400 /* RSS requires chksum */
+#define SKY2_HW_IRQ_SETUP 0x00000800
u8 chip_id;
u8 chip_rev;