mac80211, ath9k: merge some pending fixes from linux-wireless@
SVN-Revision: 35066
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/wireless/ath/ath9k/debug.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/debug.c
|
||||
@@ -1718,6 +1718,53 @@ void ath9k_get_et_stats(struct ieee80211
|
||||
@@ -1717,6 +1717,53 @@ void ath9k_get_et_stats(struct ieee80211
|
||||
WARN_ON(i != ATH9K_SSTATS_LEN);
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
int ath9k_init_debug(struct ath_hw *ah)
|
||||
{
|
||||
struct ath_common *common = ath9k_hw_common(ah);
|
||||
@@ -1735,6 +1782,8 @@ int ath9k_init_debug(struct ath_hw *ah)
|
||||
@@ -1734,6 +1781,8 @@ int ath9k_init_debug(struct ath_hw *ah)
|
||||
|
||||
ath9k_dfs_init_debug(sc);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user