diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2009-01-22 14:52:27 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2009-01-22 14:52:27 +0000 |
commit | a0c3da6d61efd0c39c4728f710e2037b2f60faff (patch) | |
tree | ef7465220fe9d7f4a3b9c48182cd104fb12241e3 /package/mac80211/patches/410-ath9k-fix-null-pointer-dereference-in-ani-monitor-c.patch | |
parent | cfd684128b77f48e33030a8bd40a6073149f24ba (diff) | |
download | upstream-a0c3da6d61efd0c39c4728f710e2037b2f60faff.tar.gz upstream-a0c3da6d61efd0c39c4728f710e2037b2f60faff.tar.bz2 upstream-a0c3da6d61efd0c39c4728f710e2037b2f60faff.zip |
mac80211: update compat-wireless to 2009-01-19
SVN-Revision: 14145
Diffstat (limited to 'package/mac80211/patches/410-ath9k-fix-null-pointer-dereference-in-ani-monitor-c.patch')
-rw-r--r-- | package/mac80211/patches/410-ath9k-fix-null-pointer-dereference-in-ani-monitor-c.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/package/mac80211/patches/410-ath9k-fix-null-pointer-dereference-in-ani-monitor-c.patch b/package/mac80211/patches/410-ath9k-fix-null-pointer-dereference-in-ani-monitor-c.patch deleted file mode 100644 index 61b8e85a80..0000000000 --- a/package/mac80211/patches/410-ath9k-fix-null-pointer-dereference-in-ani-monitor-c.patch +++ /dev/null @@ -1,40 +0,0 @@ -From ea298030ddc0089f308eec39571355aa359a1563 Mon Sep 17 00:00:00 2001 -From: Gabor Juhos <juhosg@openwrt.org> -Date: Mon, 5 Jan 2009 11:14:14 +0100 -Subject: [PATCH v3 10/11] 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. - -Changes-licensed-under: ISC - -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 -@@ -551,6 +551,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; - -@@ -610,9 +613,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 && |