From 605981fd5e493b54f0572cb6447b62bc814d6099 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 13 Apr 2011 08:47:32 -0400
Subject: [PATCH] --- yaml --- r: 246839 b: refs/heads/master c:
 8962d87129ec0a820d17ac44cbf3f51010ad8db8 h: refs/heads/master i:   246837:
 67f9450e4dbd8095c351d486bf7f3811f9a6da6a   246835:
 5149c7965017e7fc07c33bf23b567677f0885dff   246831:
 1c3a3c40e15840a889ed77e5899e92ecd895f970 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ath/ath5k/desc.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6290aae20ebc..40452e73e0d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f11c819d5fb24b637f2db605e5d3c270c979627
+refs/heads/master: 8962d87129ec0a820d17ac44cbf3f51010ad8db8
diff --git a/trunk/drivers/net/wireless/ath/ath5k/desc.c b/trunk/drivers/net/wireless/ath/ath5k/desc.c
index 0391813befd1..dd7cd95c364a 100644
--- a/trunk/drivers/net/wireless/ath/ath5k/desc.c
+++ b/trunk/drivers/net/wireless/ath/ath5k/desc.c
@@ -184,6 +184,11 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
 {
 	struct ath5k_hw_4w_tx_ctl *tx_ctl;
 	unsigned int frame_len;
+
+	/*
+	 * Use local variables for these to reduce load/store access on
+	 * uncached memory
+	 */
 	u32 txctl0 = 0, txctl1 = 0, txctl2 = 0, txctl3 = 0;
 
 	tx_ctl = &desc->ud.ds_tx5212.tx_ctl;
@@ -209,7 +214,7 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
 	if (tx_power > AR5K_TUNE_MAX_TXPOWER)
 		tx_power = AR5K_TUNE_MAX_TXPOWER;
 
-	/* Clear descriptor */
+	/* Clear descriptor status area */
 	memset(&desc->ud.ds_tx5212.tx_stat, 0,
 	       sizeof(desc->ud.ds_tx5212.tx_stat));