diff options
| author | stephen hemminger <shemminger@vyatta.com> | 2011-11-17 18:37:35 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-18 06:43:57 +0400 |
| commit | 282edcece39e08d02c22492d593e4b9b94a65dff (patch) | |
| tree | a0d0c9816a5ef76bc637a573e382379600016e09 /drivers/net/ethernet/marvell/sky2.h | |
| parent | 738a849c8eef4787a526d95763f985b8c1cb68e4 (diff) | |
| download | linux-282edcece39e08d02c22492d593e4b9b94a65dff.tar.xz | |
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.h | 1 |
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; |