diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-07-06 10:19:02 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-07-06 10:19:02 +0000 |
| commit | 725c86bd4a0f00269ff82d0c94e5ceb3ef7d27a8 (patch) | |
| tree | 63188df530382351287066a29c4631881129656e /package/kernel/mac80211/patches/933-ath10k_fix_htt_op_backwards_compatibility_for_qca6174.patch | |
| parent | c9df1f5908d5f3245e79146d27d24f65fecdf96f (diff) | |
| download | master-187ad058-725c86bd4a0f00269ff82d0c94e5ceb3ef7d27a8.tar.gz master-187ad058-725c86bd4a0f00269ff82d0c94e5ceb3ef7d27a8.tar.bz2 master-187ad058-725c86bd4a0f00269ff82d0c94e5ceb3ef7d27a8.zip | |
mac80211: Backport ath10k firmware API v5 support
These patches add support for the new version 5 firmware API.
Signed-off-by: Matti Laakso <malaakso@elisanet.fi>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46194 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/933-ath10k_fix_htt_op_backwards_compatibility_for_qca6174.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/933-ath10k_fix_htt_op_backwards_compatibility_for_qca6174.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/933-ath10k_fix_htt_op_backwards_compatibility_for_qca6174.patch b/package/kernel/mac80211/patches/933-ath10k_fix_htt_op_backwards_compatibility_for_qca6174.patch new file mode 100644 index 0000000000..fff764647f --- /dev/null +++ b/package/kernel/mac80211/patches/933-ath10k_fix_htt_op_backwards_compatibility_for_qca6174.patch @@ -0,0 +1,47 @@ +--- a/drivers/net/wireless/ath/ath10k/core.c ++++ b/drivers/net/wireless/ath/ath10k/core.c +@@ -1002,6 +1002,29 @@ static int ath10k_core_init_firmware_fea + return -EINVAL; + } + ++ /* Backwards compatibility for firmwares without ++ * ATH10K_FW_IE_HTT_OP_VERSION. ++ */ ++ if (ar->htt.op_version == ATH10K_FW_HTT_OP_VERSION_UNSET) { ++ switch (ar->wmi.op_version) { ++ case ATH10K_FW_WMI_OP_VERSION_MAIN: ++ ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_MAIN; ++ break; ++ case ATH10K_FW_WMI_OP_VERSION_10_1: ++ case ATH10K_FW_WMI_OP_VERSION_10_2: ++ case ATH10K_FW_WMI_OP_VERSION_10_2_4: ++ ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_10_1; ++ break; ++ case ATH10K_FW_WMI_OP_VERSION_TLV: ++ ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_TLV; ++ break; ++ case ATH10K_FW_WMI_OP_VERSION_UNSET: ++ case ATH10K_FW_WMI_OP_VERSION_MAX: ++ WARN_ON(1); ++ return -EINVAL; ++ } ++ } ++ + return 0; + } + +--- a/drivers/net/wireless/ath/ath10k/htt.c ++++ b/drivers/net/wireless/ath/ath10k/htt.c +@@ -156,11 +156,11 @@ int ath10k_htt_init(struct ath10k *ar) + ar->htt.t2h_msg_types_max = HTT_TLV_T2H_NUM_MSGS; + break; + case ATH10K_FW_HTT_OP_VERSION_MAIN: +- case ATH10K_FW_HTT_OP_VERSION_UNSET: + ar->htt.t2h_msg_types = htt_main_t2h_msg_types; + ar->htt.t2h_msg_types_max = HTT_MAIN_T2H_NUM_MSGS; + break; + case ATH10K_FW_HTT_OP_VERSION_MAX: ++ case ATH10K_FW_HTT_OP_VERSION_UNSET: + WARN_ON(1); + return -EINVAL; + } |