Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / wireless / ath / carl9170 / carl9170.h

diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h
index 6cf0c9ef47aa4e7ae005abc034edca2fb40d30e6..d07ff7f2fd92d653103538b86353c6c986f9aca9 100644 (file)
--- a/drivers/net/wireless/ath/carl9170/carl9170.h
+++ b/drivers/net/wireless/ath/carl9170/carl9170.h
@@ -48,7 +48,7 @@
 #include <linux/usb.h>
 #ifdef CONFIG_CARL9170_LEDS
 #include <linux/leds.h>
-#endif /* CONFIG_CARL170_LEDS */
+#endif /* CONFIG_CARL9170_LEDS */
 #ifdef CONFIG_CARL9170_WPC
 #include <linux/input.h>
 #endif /* CONFIG_CARL9170_WPC */
@@ -215,7 +215,7 @@ enum carl9170_restart_reasons {
        CARL9170_RR_TOO_MANY_FIRMWARE_ERRORS,
        CARL9170_RR_WATCHDOG,
        CARL9170_RR_STUCK_TX,
-       CARL9170_RR_SLOW_SYSTEM,
+       CARL9170_RR_UNRESPONSIVE_DEVICE,
        CARL9170_RR_COMMAND_TIMEOUT,
        CARL9170_RR_TOO_MANY_PHY_ERRORS,
        CARL9170_RR_LOST_RSP,
@@ -287,6 +287,7 @@ struct ar9170 {
 
        /* reset / stuck frames/queue detection */
        struct work_struct restart_work;
+       struct work_struct ping_work;
        unsigned int restart_counter;
        unsigned long queue_stop_timeout[__AR9170_NUM_TXQ];
        unsigned long max_queue_stop_timeout[__AR9170_NUM_TXQ];