From: Greg Kroah-Hartman Date: Tue, 30 Mar 2010 19:56:22 +0000 (-0700) Subject: delete queue-2.6.32/ath9k-configure-the-beacon-only-if-the-sta-is-associated.patch X-Git-Tag: v2.6.27.46~12 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a8d6eef938044d6d63e18025919a0608ed8020f3;p=thirdparty%2Fkernel%2Fstable-queue.git delete queue-2.6.32/ath9k-configure-the-beacon-only-if-the-sta-is-associated.patch it breaks the build --- diff --git a/queue-2.6.32/ath9k-configure-the-beacon-only-if-the-sta-is-associated.patch b/queue-2.6.32/ath9k-configure-the-beacon-only-if-the-sta-is-associated.patch deleted file mode 100644 index 637a6de971d..00000000000 --- a/queue-2.6.32/ath9k-configure-the-beacon-only-if-the-sta-is-associated.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ec3a9974892956aec86a4065bf6e48bc2cd92d04 Mon Sep 17 00:00:00 2001 -From: Senthil Balasubramanian -Date: Wed, 3 Feb 2010 22:50:18 +0530 -Subject: ath9k: configure the beacon only if the STA is associated - -From: Senthil Balasubramanian - -commit 1a20034a73a40b8056731f9db0c535cec2961eb7 upstream. - -beacons configuration SHOULD be done only if the STA is associated. - -Signed-off-by: Senthil Balasubramanian -Signed-off-by: John W. Linville -Signed-off-by: Luis R. Rodriguez -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/wireless/ath/ath9k/beacon.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/net/wireless/ath/ath9k/beacon.c -+++ b/drivers/net/wireless/ath/ath9k/beacon.c -@@ -559,6 +559,13 @@ static void ath_beacon_config_sta(struct - u64 tsf; - int num_beacons, offset, dtim_dec_count, cfp_dec_count; - -+ /* No need to configure beacon if we are not associated */ -+ if (!common->curaid) { -+ ath_print(common, ATH_DBG_BEACON, -+ "STA is not yet associated..skipping beacon config\n"); -+ return; -+ } -+ - memset(&bs, 0, sizeof(bs)); - intval = conf->beacon_interval & ATH9K_BEACON_PERIOD; - diff --git a/queue-2.6.32/series b/queue-2.6.32/series index 88bb6a49941..172c712ba4b 100644 --- a/queue-2.6.32/series +++ b/queue-2.6.32/series @@ -100,7 +100,6 @@ alsa-ac97-add-toshiba-p500-to-ac97-jack-sense-blacklist.patch alsa-ac97-add-ibm-thinkpad-r40e-to-headphone-line-jack-sense-blacklist.patch alsa-hda-use-alc260_will-quirk-for-another-acer-model-0x1025007f.patch ath9k-enable-tim-timer-interrupt-only-when-needed.patch -ath9k-configure-the-beacon-only-if-the-sta-is-associated.patch mac80211-retry-null-data-frame-for-power-save.patch ath9k-enable-ieee80211_hw_reports_tx_ack_status-flag-for-ath9k.patch mac80211-reset-dynamic-ps-timer-in-rx-path.patch