2 files changed, 15 insertions, 4 deletions

diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 1a4e2e1f7ca5..92ddcd952423 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -807,7 +807,6 @@ static int zd1211_hw_init_hmac(struct zd_chip *chip)
                 { CR_ACK_TIMEOUT_EXT,           0x80 },
                 { CR_ADDA_PWR_DWN,              0x00 },
                 { CR_ACK_TIME_80211,            0x100 },
-                { CR_IFS_VALUE,                 0x547c032 },
                 { CR_RX_PE_DELAY,               0x70 },
                 { CR_PS_CTRL,                   0x10000000 },
                 { CR_RTS_CTS_RATE,              0x02030203 },
@@ -854,7 +853,6 @@ static int zd1211b_hw_init_hmac(struct zd_chip *chip)
                 { CR_ACK_TIMEOUT_EXT,           0x80 },
                 { CR_ADDA_PWR_DWN,              0x00 },
                 { CR_ACK_TIME_80211,            0x100 },
-                { CR_IFS_VALUE,                 0x547c032 },
                 { CR_RX_PE_DELAY,               0x70 },
                 { CR_PS_CTRL,                   0x10000000 },
                 { CR_RTS_CTS_RATE,              0x02030203 },
@@ -970,10 +968,15 @@ static int hw_init(struct zd_chip *chip)
         r = hw_init_hmac(chip);
         if (r)
                 return r;
-        r = set_beacon_interval(chip, 100);
+
+        /* Although the vendor driver defaults to a different value during
+         * init, it overwrites the IFS value with the following every time
+         * the channel changes. We should aim to be more intelligent... */
+        r = zd_iowrite32_locked(chip, IFS_VALUE_DEFAULT, CR_IFS_VALUE);
         if (r)
                 return r;
-        return 0;
+
+        return set_beacon_interval(chip, 100);
 }
 
 #ifdef DEBUG
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zd1211rw/zd_chip.h
index 069d2b467339..4a412eea8818 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.h
+++ b/drivers/net/wireless/zd1211rw/zd_chip.h
@@ -473,7 +473,15 @@
 
 #define CR_ACK_TIMEOUT_EXT              CTL_REG(0x0690)
 #define CR_BCN_FIFO_SEMAPHORE           CTL_REG(0x0694)
+
 #define CR_IFS_VALUE                    CTL_REG(0x0698)
+#define IFS_VALUE_DIFS_SH               0
+#define IFS_VALUE_EIFS_SH               12
+#define IFS_VALUE_SIFS_SH               24
+#define IFS_VALUE_DEFAULT               ((  50 << IFS_VALUE_DIFS_SH) | \
+                                         (1148 << IFS_VALUE_EIFS_SH) | \
+                                         (  10 << IFS_VALUE_SIFS_SH))
+
 #define CR_RX_TIME_OUT                  CTL_REG(0x069C)
 #define CR_TOTAL_RX_FRM                 CTL_REG(0x06A0)
 #define CR_CRC32_CNT                    CTL_REG(0x06A4)