Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

[karo-tx-linux.git] / drivers / net / wireless / ath / ath6kl / debug.h

diff --git a/drivers/net/wireless/ath/ath6kl/debug.h b/drivers/net/wireless/ath/ath6kl/debug.h
index 7b7675f70a102a585a6fc1be257242b1c63d496b..9853c9c125c1417c9ab87de1afc6aea8b8fe3160 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/debug.h
+++ b/drivers/net/wireless/ath/ath6kl/debug.h
@@ -17,19 +17,19 @@
 #ifndef DEBUG_H
 #define DEBUG_H
 
-#include "htc_hif.h"
+#include "hif.h"
 
 enum ATH6K_DEBUG_MASK {
-       ATH6KL_DBG_WLAN_CONNECT = BIT(0),     /* wlan connect */
-       ATH6KL_DBG_WLAN_SCAN    = BIT(1),     /* wlan scan */
+       ATH6KL_DBG_CREDIT       = BIT(0),
+       /* hole */
        ATH6KL_DBG_WLAN_TX      = BIT(2),     /* wlan tx */
        ATH6KL_DBG_WLAN_RX      = BIT(3),     /* wlan rx */
        ATH6KL_DBG_BMI          = BIT(4),     /* bmi tracing */
-       ATH6KL_DBG_HTC_SEND     = BIT(5),     /* htc send */
-       ATH6KL_DBG_HTC_RECV     = BIT(6),     /* htc recv */
+       ATH6KL_DBG_HTC          = BIT(5),
+       ATH6KL_DBG_HIF          = BIT(6),
        ATH6KL_DBG_IRQ          = BIT(7),     /* interrupt processing */
-       ATH6KL_DBG_PM           = BIT(8),     /* power management */
-       ATH6KL_DBG_WLAN_NODE    = BIT(9),     /* general wlan node tracing */
+       /* hole */
+       /* hole */
        ATH6KL_DBG_WMI          = BIT(10),    /* wmi tracing */
        ATH6KL_DBG_TRC          = BIT(11),    /* generic func tracing */
        ATH6KL_DBG_SCATTER      = BIT(12),    /* hif scatter tracing */
@@ -40,6 +40,7 @@ enum ATH6K_DEBUG_MASK {
        ATH6KL_DBG_SDIO_DUMP    = BIT(17),
        ATH6KL_DBG_BOOT         = BIT(18),    /* driver init and fw boot */
        ATH6KL_DBG_WMI_DUMP     = BIT(19),
+       ATH6KL_DBG_SUSPEND      = BIT(20),
        ATH6KL_DBG_ANY          = 0xffffffff  /* enable all logs */
 };
 
@@ -90,6 +91,10 @@ void ath6kl_dump_registers(struct ath6kl_device *dev,
 void dump_cred_dist_stats(struct htc_target *target);
 void ath6kl_debug_fwlog_event(struct ath6kl *ar, const void *buf, size_t len);
 void ath6kl_debug_war(struct ath6kl *ar, enum ath6kl_war war);
+int ath6kl_debug_roam_tbl_event(struct ath6kl *ar, const void *buf,
+                               size_t len);
+void ath6kl_debug_set_keepalive(struct ath6kl *ar, u8 keepalive);
+void ath6kl_debug_set_disconnect_timeout(struct ath6kl *ar, u8 timeout);
 int ath6kl_debug_init(struct ath6kl *ar);
 void ath6kl_debug_cleanup(struct ath6kl *ar);
 
@@ -125,6 +130,21 @@ static inline void ath6kl_debug_war(struct ath6kl *ar, enum ath6kl_war war)
 {
 }
 
+static inline int ath6kl_debug_roam_tbl_event(struct ath6kl *ar,
+                                             const void *buf, size_t len)
+{
+       return 0;
+}
+
+static inline void ath6kl_debug_set_keepalive(struct ath6kl *ar, u8 keepalive)
+{
+}
+
+static inline void ath6kl_debug_set_disconnect_timeout(struct ath6kl *ar,
+                                                      u8 timeout)
+{
+}
+
 static inline int ath6kl_debug_init(struct ath6kl *ar)
 {
        return 0;