mac80211: refresh patches

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / 650-rt2x00-add-support-for-external-PA-on-MT7620.patch

diff --git a/package/kernel/mac80211/patches/650-rt2x00-add-support-for-external-PA-on-MT7620.patch b/package/kernel/mac80211/patches/650-rt2x00-add-support-for-external-PA-on-MT7620.patch
index b2248614a3a8316845209777fb2173f0207ffcf8..64a62f4b0792168fb60e3f33b20d0f8a751aa911 100644 (file)
--- a/package/kernel/mac80211/patches/650-rt2x00-add-support-for-external-PA-on-MT7620.patch
+++ b/package/kernel/mac80211/patches/650-rt2x00-add-support-for-external-PA-on-MT7620.patch
@@ -13,11 +13,9 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 70 +++++++++++++++++++++++++-
  2 files changed, 70 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800.h b/drivers/net/wireless/ralink/rt2x00/rt2800.h
-index 6a8c93fb6a43..df0cefe44171 100644
 --- a/drivers/net/wireless/ralink/rt2x00/rt2800.h
 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h
-@@ -2732,6 +2732,7 @@ enum rt2800_eeprom_word {
+@@ -2749,6 +2749,7 @@ enum rt2800_eeprom_word {
  #define EEPROM_NIC_CONF2_RX_STREAM    FIELD16(0x000f)
  #define EEPROM_NIC_CONF2_TX_STREAM    FIELD16(0x00f0)
  #define EEPROM_NIC_CONF2_CRYSTAL      FIELD16(0x0600)
@@ -25,11 +23,9 @@ index 6a8c93fb6a43..df0cefe44171 100644
  
  /*
   * EEPROM LNA
-diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
-index c06db547b0a4..db431c9544e2 100644
 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
-@@ -3834,6 +3834,61 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
+@@ -4114,6 +4114,61 @@ static void rt2800_config_channel(struct
                rt2800_iq_calibrate(rt2x00dev, rf->channel);
        }
  
@@ -91,7 +87,7 @@ index c06db547b0a4..db431c9544e2 100644
        rt2800_bbp_read(rt2x00dev, 4, &bbp);
        rt2x00_set_field8(&bbp, BBP4_BANDWIDTH, 2 * conf_is_ht40(conf));
        rt2800_bbp_write(rt2x00dev, 4, bbp);
-@@ -8796,7 +8851,8 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
+@@ -9308,7 +9363,8 @@ static int rt2800_init_eeprom(struct rt2
         */
        rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
  
@@ -101,7 +97,7 @@ index c06db547b0a4..db431c9544e2 100644
                if (rt2x00_get_field16(eeprom,
                    EEPROM_NIC_CONF1_EXTERNAL_TX0_PA_3352))
                    __set_bit(CAPABILITY_EXTERNAL_PA_TX0,
-@@ -8807,6 +8863,18 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
+@@ -9319,6 +9375,18 @@ static int rt2800_init_eeprom(struct rt2
                              &rt2x00dev->cap_flags);
        }
  
@@ -120,6 +116,3 @@ index c06db547b0a4..db431c9544e2 100644
        return 0;
  }
  
--- 
-2.12.2
-