package/kernel/mac80211/patches/933-ath10k_fix_htt_op_backwards_compatibility_for_qca6174.patch

   1 --- a/drivers/net/wireless/ath/ath10k/core.c
   2 +++ b/drivers/net/wireless/ath/ath10k/core.c
   3 @@ -1002,6 +1002,29 @@ static int ath10k_core_init_firmware_fea
   4                 return -EINVAL;
   5         }
   6
   7 +       /* Backwards compatibility for firmwares without
   8 +        * ATH10K_FW_IE_HTT_OP_VERSION.
   9 +        */
  10 +       if (ar->htt.op_version == ATH10K_FW_HTT_OP_VERSION_UNSET) {
  11 +               switch (ar->wmi.op_version) {
  12 +               case ATH10K_FW_WMI_OP_VERSION_MAIN:
  13 +                       ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_MAIN;
  14 +                       break;
  15 +               case ATH10K_FW_WMI_OP_VERSION_10_1:
  16 +               case ATH10K_FW_WMI_OP_VERSION_10_2:
  17 +               case ATH10K_FW_WMI_OP_VERSION_10_2_4:
  18 +                       ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_10_1;
  19 +                       break;
  20 +               case ATH10K_FW_WMI_OP_VERSION_TLV:
  21 +                       ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_TLV;
  22 +                       break;
  23 +               case ATH10K_FW_WMI_OP_VERSION_UNSET:
  24 +               case ATH10K_FW_WMI_OP_VERSION_MAX:
  25 +                       WARN_ON(1);
  26 +                       return -EINVAL;
  27 +               }
  28 +       }
  29 +
  30         return 0;
  31  }
  32
  33 --- a/drivers/net/wireless/ath/ath10k/htt.c
  34 +++ b/drivers/net/wireless/ath/ath10k/htt.c
  35 @@ -156,11 +156,11 @@ int ath10k_htt_init(struct ath10k *ar)
  36                 ar->htt.t2h_msg_types_max = HTT_TLV_T2H_NUM_MSGS;
  37                 break;
  38         case ATH10K_FW_HTT_OP_VERSION_MAIN:
  39 -       case ATH10K_FW_HTT_OP_VERSION_UNSET:
  40                 ar->htt.t2h_msg_types = htt_main_t2h_msg_types;
  41                 ar->htt.t2h_msg_types_max = HTT_MAIN_T2H_NUM_MSGS;
  42                 break;
  43         case ATH10K_FW_HTT_OP_VERSION_MAX:
  44 +       case ATH10K_FW_HTT_OP_VERSION_UNSET:
  45                 WARN_ON(1);
  46                 return -EINVAL;
  47         }