mac80211: update to wireless-testing 2017-01-31

[openwrt/staging/yousong.git] / package / kernel / mac80211 / patches / 936-ath10k_skip_otp_check.patch

diff --git a/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch b/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
index fbda8d5ac176a5cd0e5fe144e3d878bf90cb895e..057995c55acf9015c64291013738e95b18df75a2 100644 (file)
--- a/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
+++ b/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath10k/core.c
 +++ b/drivers/net/wireless/ath/ath10k/core.c
-@@ -1282,9 +1282,6 @@ static int ath10k_core_fetch_firmware_fi
+@@ -1362,9 +1362,6 @@ static int ath10k_core_fetch_firmware_fi
  {
        int ret;
  
@@ -10,7 +10,7 @@
        ar->fw_api = 5;
        ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);
  
-@@ -2054,7 +2051,7 @@ EXPORT_SYMBOL(ath10k_core_stop);
+@@ -2149,7 +2146,7 @@ EXPORT_SYMBOL(ath10k_core_stop);
  static int ath10k_core_probe_fw(struct ath10k *ar)
  {
        struct bmi_target_info target_info;
@@ -19,7 +19,7 @@
  
        ret = ath10k_hif_power_up(ar);
        if (ret) {
-@@ -2078,6 +2075,9 @@ static int ath10k_core_probe_fw(struct a
+@@ -2173,6 +2170,9 @@ static int ath10k_core_probe_fw(struct a
                goto err_power_down;
        }
  
@@ -29,7 +29,7 @@
        ret = ath10k_core_fetch_firmware_files(ar);
        if (ret) {
                ath10k_err(ar, "could not fetch firmware files (%d)\n", ret);
-@@ -2100,11 +2100,14 @@ static int ath10k_core_probe_fw(struct a
+@@ -2195,11 +2195,14 @@ static int ath10k_core_probe_fw(struct a
                           "could not load pre cal data: %d\n", ret);
        }
  
@@ -48,4 +48,4 @@
 +              }
        }
  
-       ret = ath10k_core_fetch_board_file(ar);
+       ret = ath10k_core_check_smbios(ar);