package/kernel/mac80211/patches/621-rt2x00-ht20_40_fix.patch

   1 Index: compat-wireless-2014-05-22/drivers/net/wireless/rt2x00/rt2800.h
   2 ===================================================================
   3 --- compat-wireless-2014-05-22.orig/drivers/net/wireless/rt2x00/rt2800.h        2014-08-31 05:04:55.600142409 +0200
   4 +++ compat-wireless-2014-05-22/drivers/net/wireless/rt2x00/rt2800.h     2014-08-31 05:11:02.068145882 +0200
   5 @@ -2346,6 +2346,8 @@
   6  #define RFCSR30_RX_H20M                        FIELD8(0x04)
   7  #define RFCSR30_RX_VCM                 FIELD8(0x18)
   8  #define RFCSR30_RF_CALIBRATION         FIELD8(0x80)
   9 +#define RF3322_RFCSR30_TX_H20M         FIELD8(0x01)
  10 +#define RF3322_RFCSR30_RX_H20M         FIELD8(0x02)
  11
  12  /*
  13   * RFCSR 31:
  14 Index: compat-wireless-2014-05-22/drivers/net/wireless/rt2x00/rt2800lib.c
  15 ===================================================================
  16 --- compat-wireless-2014-05-22.orig/drivers/net/wireless/rt2x00/rt2800lib.c     2014-08-31 05:04:55.604142409 +0200
  17 +++ compat-wireless-2014-05-22/drivers/net/wireless/rt2x00/rt2800lib.c  2014-08-31 05:15:02.176148157 +0200
  18 @@ -3928,8 +3928,13 @@
  19             rt2x00_rf(rt2x00dev, RF5390) ||
  20             rt2x00_rf(rt2x00dev, RF5392)) {
  21                 rt2800_rfcsr_read(rt2x00dev, 30, &rfcsr);
  22 -               rt2x00_set_field8(&rfcsr, RFCSR30_TX_H20M, 0);
  23 -               rt2x00_set_field8(&rfcsr, RFCSR30_RX_H20M, 0);
  24 +               if(rt2x00_rf(rt2x00dev, RF3322)) {
  25 +                       rt2x00_set_field8(&rfcsr, RF3322_RFCSR30_TX_H20M, conf_is_ht40(conf));
  26 +                       rt2x00_set_field8(&rfcsr, RF3322_RFCSR30_RX_H20M, conf_is_ht40(conf));
  27 +               } else {
  28 +                       rt2x00_set_field8(&rfcsr, RFCSR30_TX_H20M, conf_is_ht40(conf));
  29 +                       rt2x00_set_field8(&rfcsr, RFCSR30_RX_H20M, conf_is_ht40(conf));
  30 +               }
  31                 rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
  32
  33                 rt2800_rfcsr_read(rt2x00dev, 3, &rfcsr);