From ce53bbcc557003639c84910858951f7793a39997 Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Mon, 30 Jan 2012 16:17:56 +0100
Subject: [PATCH] --- yaml --- r: 290343 b: refs/heads/master c:
 7f4666ab3fd656513bffd449410a4d7c189081ec h: refs/heads/master i:   290341:
 d81029f698a4c58aa63631bdb16389ffc37b0ab9   290339:
 1cfa6d702318e6bdce1b4ab452634d784ba66d19   290335:
 4e9bd39019afb06bd0f0807f5c5dab105fe31a5f v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/rt2x00/rt2800.h    | 5 +++++
 trunk/drivers/net/wireless/rt2x00/rt2800lib.c | 5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 533521ddd4fa..423817e22da7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5718b134b1fe09087ca225b0e475ef65536d02b4
+refs/heads/master: 7f4666ab3fd656513bffd449410a4d7c189081ec
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2800.h b/trunk/drivers/net/wireless/rt2x00/rt2800.h
index 2571a2fa3d09..abf2ae588164 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2800.h
+++ b/trunk/drivers/net/wireless/rt2x00/rt2800.h
@@ -1795,6 +1795,11 @@ struct mac_iveiv_entry {
  */
 #define RFCSR2_RESCAL_EN		FIELD8(0x80)
 
+/*
+ * RFCSR 3:
+ */
+#define RFCSR3_K			FIELD8(0x0f)
+
 /*
  * FRCSR 5:
  */
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2800lib.c b/trunk/drivers/net/wireless/rt2x00/rt2800lib.c
index 165535cc5072..006347e4d6ef 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/trunk/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -1648,7 +1648,10 @@ static void rt2800_config_channel_rf3xxx(struct rt2x00_dev *rt2x00dev,
 	u8 rfcsr;
 
 	rt2800_rfcsr_write(rt2x00dev, 2, rf->rf1);
-	rt2800_rfcsr_write(rt2x00dev, 3, rf->rf3);
+
+	rt2800_rfcsr_read(rt2x00dev, 3, &rfcsr);
+	rt2x00_set_field8(&rfcsr, RFCSR3_K, rf->rf3);
+	rt2800_rfcsr_write(rt2x00dev, 3, rfcsr);
 
 	rt2800_rfcsr_read(rt2x00dev, 6, &rfcsr);
 	rt2x00_set_field8(&rfcsr, RFCSR6_R1, rf->rf2);