projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: use ieee80211_free_txskb in a few more places to prevent skb leaks
[openwrt.git]
/
package
/
mac80211
/
patches
/
512-ath9k_channelbw_debugfs.patch
diff --git
a/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch
b/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch
index d688b065b06bad0db27209b44e29ce9861f3b604..d4087a0b28f89771c942ec093aff51f1a3314480 100644
(file)
--- a/
package/mac80211/patches/512-ath9k_channelbw_debugfs.patch
+++ b/
package/mac80211/patches/512-ath9k_channelbw_debugfs.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -6
49,6 +64
9,7 @@ struct ath_softc {
+@@ -6
59,6 +65
9,7 @@ struct ath_softc {
struct ieee80211_hw *hw;
struct device *dev;
struct ieee80211_hw *hw;
struct device *dev;
@@
-8,8
+8,8
@@
struct survey_info *cur_survey;
struct survey_info survey[ATH9K_NUM_CHANNELS];
struct survey_info *cur_survey;
struct survey_info survey[ATH9K_NUM_CHANNELS];
-@@ -7
17,6 +718
,7 @@ struct ath_softc {
- struct dfs_pattern_detector *dfs_detector;
+@@ -7
34,6 +735
,7 @@ struct ath_softc {
+ #endif
};
+int ath9k_config(struct ieee80211_hw *hw, u32 changed);
};
+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);
int ath9k_init_debug(struct ath_hw *ah)
{
struct ath_common *common = ath9k_hw_common(ah);
-@@ -16
45,5 +1689
,8 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -16
53,5 +1697
,8 @@ int ath9k_init_debug(struct ath_hw *ah)
debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
&fops_eeprom);
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
}
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1
084,7 +1084
,7 @@ static void ath9k_disable_ps(struct ath_
+@@ -1
127,7 +1127
,7 @@ static void ath9k_disable_ps(struct ath_
ath_dbg(common, PS, "PowerSave disabled\n");
}
ath_dbg(common, PS, "PowerSave disabled\n");
}
@@
-89,7
+89,7
@@
{
struct ath_softc *sc = hw->priv;
struct ath_hw *ah = sc->sc_ah;
{
struct ath_softc *sc = hw->priv;
struct ath_hw *ah = sc->sc_ah;
-@@ -11
38,9 +1138
,11 @@ static int ath9k_config(struct ieee80211
+@@ -11
81,9 +1181
,11 @@ static int ath9k_config(struct ieee80211
if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || reset_channel) {
struct ieee80211_channel *curchan = hw->conf.channel;
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];
if (ah->curchan)
old_pos = ah->curchan - &ah->channels[0];
-@@ -1
183,7 +1185
,23 @@ static int ath9k_config(struct ieee80211
+@@ -1
226,7 +1228
,23 @@ static int ath9k_config(struct ieee80211
memset(&sc->survey[pos], 0, sizeof(struct survey_info));
}
memset(&sc->survey[pos], 0, sizeof(struct survey_info));
}