4 files changed, 17 insertions, 1 deletions

diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 4a2ceb93aaad..5b624bfc01a6 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -1286,7 +1286,7 @@ static int patch_cck_gain(struct zd_chip *chip)
         int r;
         u32 value;
 
-        if (!chip->patch_cck_gain)
+        if (!chip->patch_cck_gain || !zd_rf_should_patch_cck_gain(&chip->rf))
                 return 0;
 
         ZD_ASSERT(mutex_is_locked(&chip->mutex));
diff --git a/drivers/net/wireless/zd1211rw/zd_rf.h b/drivers/net/wireless/zd1211rw/zd_rf.h
index 6dced2ae5a11..c6dfd8227f6e 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf.h
+++ b/drivers/net/wireless/zd1211rw/zd_rf.h
@@ -52,6 +52,12 @@ struct zd_rf {
          * defaults to 1 (yes) */
         u8 update_channel_int:1;
 
+        /* whether CR47 should be patched from the EEPROM, if the appropriate
+         * flag is set in the POD. The vendor driver suggests that this should
+         * be done for all RF's, but a bug in their code prevents but their
+         * HW_OverWritePhyRegFromE2P() routine from ever taking effect. */
+        u8 patch_cck_gain:1;
+
         /* private RF driver data */
         void *priv;
 
@@ -84,6 +90,14 @@ static inline int zd_rf_should_update_pwr_int(struct zd_rf *rf)
         return rf->update_channel_int;
 }
 
+static inline int zd_rf_should_patch_cck_gain(struct zd_rf *rf)
+{
+        return rf->patch_cck_gain;
+}
+
+int zd_rf_patch_6m_band_edge(struct zd_rf *rf, u8 channel);
+int zd_rf_generic_patch_6m(struct zd_rf *rf, u8 channel);
+
 /* Functions for individual RF chips */
 
 int zd_rf_init_rf2959(struct zd_rf *rf);
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_al2230.c b/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
index 511392acfedf..e7a4ecf7b6e2 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
@@ -432,5 +432,6 @@ int zd_rf_init_al2230(struct zd_rf *rf)
                 rf->switch_radio_on = zd1211_al2230_switch_radio_on;
         }
         rf->patch_6m_band_edge = zd_rf_generic_patch_6m;
+        rf->patch_cck_gain = 1;
         return 0;
 }
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c b/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
index 5e5e9ddc6a74..f4e8b6ada854 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
@@ -483,6 +483,7 @@ int zd_rf_init_al7230b(struct zd_rf *rf)
                 rf->switch_radio_on = zd1211_al7230b_switch_radio_on;
                 rf->set_channel = zd1211_al7230b_set_channel;
                 rf->patch_6m_band_edge = zd_rf_generic_patch_6m;
+                rf->patch_cck_gain = 1;
         }
 
         rf->switch_radio_off = al7230b_switch_radio_off;