aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-07-04 03:02:52 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-07-04 03:02:52 +0000
commit5d52524c3f95bab32228eba3034853892eb63ab0 (patch)
tree978553f721b1f0fbb8bc16474b31bd91f4e4cf3c
parent2e3b0f7f91b71a656b3c4eaf2452e920b3a173a1 (diff)
downloadupstream-5d52524c3f95bab32228eba3034853892eb63ab0.tar.gz
upstream-5d52524c3f95bab32228eba3034853892eb63ab0.tar.bz2
upstream-5d52524c3f95bab32228eba3034853892eb63ab0.zip
ath5k: add an upstream patch to fix a memory leak
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27432 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/300-pending_work.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index 0900596dc9..285ce69449 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -461,3 +461,23 @@
void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx);
#endif /* AR9003_PHY_H */
+--- a/drivers/net/wireless/ath/ath5k/eeprom.c
++++ b/drivers/net/wireless/ath/ath5k/eeprom.c
+@@ -691,14 +691,12 @@ ath5k_eeprom_free_pcal_info(struct ath5k
+ if (!chinfo[pier].pd_curves)
+ continue;
+
+- for (pdg = 0; pdg < ee->ee_pd_gains[mode]; pdg++) {
++ for (pdg = 0; pdg < AR5K_EEPROM_N_PD_CURVES; pdg++) {
+ struct ath5k_pdgain_info *pd =
+ &chinfo[pier].pd_curves[pdg];
+
+- if (pd != NULL) {
+- kfree(pd->pd_step);
+- kfree(pd->pd_pwr);
+- }
++ kfree(pd->pd_step);
++ kfree(pd->pd_pwr);
+ }
+
+ kfree(chinfo[pier].pd_curves);