summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/412-ath9k-fix-null-pointer-dereference-in-ani-monitor-c.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-01-07 18:17:27 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-01-07 18:17:27 +0000
commiteb434568feb9157a62875a1ea504cc15ad553b4d (patch)
treece7d24ad750157537f60114e154bf93737dda7a6 /package/mac80211/patches/412-ath9k-fix-null-pointer-dereference-in-ani-monitor-c.patch
parent3ba5259acf309f64b331ad49bf83cbf1526f8a79 (diff)
[package] mac80211: update compat-wireless to 2009-01-07, and refresh ath9k patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13925 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/412-ath9k-fix-null-pointer-dereference-in-ani-monitor-c.patch')
-rw-r--r--package/mac80211/patches/412-ath9k-fix-null-pointer-dereference-in-ani-monitor-c.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/package/mac80211/patches/412-ath9k-fix-null-pointer-dereference-in-ani-monitor-c.patch b/package/mac80211/patches/412-ath9k-fix-null-pointer-dereference-in-ani-monitor-c.patch
deleted file mode 100644
index ef73f17ed..000000000
--- a/package/mac80211/patches/412-ath9k-fix-null-pointer-dereference-in-ani-monitor-c.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e5d00646a207c4e9da254283eee2d278de338394 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Fri, 2 Jan 2009 16:17:25 +0100
-Subject: [RFC 12/12] ath9k: fix null pointer dereference in ani monitor code
-
-In 'ath9k_ani_reset' the 'ahp->ah_curani' will be initialized only
-if 'DO_ANI(ah)' true. In 'ath9k_hw_ani_monitor' we are using 'ahp->ah_curani'
-unconditionally, and it will cause a NULL pointer dereference on AR9100.
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
-Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
----
- drivers/net/wireless/ath9k/ani.c | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/net/wireless/ath9k/ani.c
-+++ b/drivers/net/wireless/ath9k/ani.c
-@@ -555,6 +555,9 @@ void ath9k_hw_ani_monitor(struct ath_hal
- struct ar5416AniState *aniState;
- int32_t listenTime;
-
-+ if (!DO_ANI(ah))
-+ return;
-+
- aniState = ahp->ah_curani;
- ahp->ah_stats.ast_nodestats = *stats;
-
-@@ -614,9 +617,6 @@ void ath9k_hw_ani_monitor(struct ath_hal
- aniState->cckPhyErrCount = cckPhyErrCnt;
- }
-
-- if (!DO_ANI(ah))
-- return;
--
- if (aniState->listenTime > 5 * ahp->ah_aniPeriod) {
- if (aniState->ofdmPhyErrCount <= aniState->listenTime *
- aniState->ofdmTrigLow / 1000 &&