mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
mac80211: update to latest wireless-testing + some monitor mode fixes and some libertas driver fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32760 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
|
||||
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
|
||||
@@ -649,6 +649,7 @@ struct ath_softc {
|
||||
@@ -658,6 +658,7 @@ struct ath_softc {
|
||||
struct ieee80211_hw *hw;
|
||||
struct device *dev;
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
struct survey_info *cur_survey;
|
||||
struct survey_info survey[ATH9K_NUM_CHANNELS];
|
||||
|
||||
@@ -717,6 +718,7 @@ struct ath_softc {
|
||||
struct dfs_pattern_detector *dfs_detector;
|
||||
@@ -733,6 +734,7 @@ struct ath_softc {
|
||||
#endif
|
||||
};
|
||||
|
||||
+int ath9k_config(struct ieee80211_hw *hw, u32 changed);
|
||||
@@ -69,7 +69,7 @@
|
||||
int ath9k_init_debug(struct ath_hw *ah)
|
||||
{
|
||||
struct ath_common *common = ath9k_hw_common(ah);
|
||||
@@ -1645,5 +1689,8 @@ int ath9k_init_debug(struct ath_hw *ah)
|
||||
@@ -1653,5 +1697,8 @@ int ath9k_init_debug(struct ath_hw *ah)
|
||||
debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
|
||||
&fops_eeprom);
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
}
|
||||
--- a/drivers/net/wireless/ath/ath9k/main.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
||||
@@ -1084,7 +1084,7 @@ static void ath9k_disable_ps(struct ath_
|
||||
@@ -1095,7 +1095,7 @@ static void ath9k_disable_ps(struct ath_
|
||||
ath_dbg(common, PS, "PowerSave disabled\n");
|
||||
}
|
||||
|
||||
@@ -89,7 +89,7 @@
|
||||
{
|
||||
struct ath_softc *sc = hw->priv;
|
||||
struct ath_hw *ah = sc->sc_ah;
|
||||
@@ -1138,9 +1138,11 @@ static int ath9k_config(struct ieee80211
|
||||
@@ -1149,9 +1149,11 @@ static int ath9k_config(struct ieee80211
|
||||
|
||||
if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || reset_channel) {
|
||||
struct ieee80211_channel *curchan = hw->conf.channel;
|
||||
@@ -101,7 +101,7 @@
|
||||
|
||||
if (ah->curchan)
|
||||
old_pos = ah->curchan - &ah->channels[0];
|
||||
@@ -1183,7 +1185,23 @@ static int ath9k_config(struct ieee80211
|
||||
@@ -1194,7 +1196,23 @@ static int ath9k_config(struct ieee80211
|
||||
memset(&sc->survey[pos], 0, sizeof(struct survey_info));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user