mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
64002d3a24
Synchronize the ath11k backports with the current ath-next tree. This introduces support for MBSSID and EMA, adds factory test mode and some new HTT stats. Tested-by: Francisco G Luna <frangonlun@gmail.com> Signed-off-by: Robert Marko <robimarko@gmail.com>
129 lines
3.7 KiB
Diff
129 lines
3.7 KiB
Diff
From 86f85575a3f6a20cef1c8bb98e78585fe3a53ccc Mon Sep 17 00:00:00 2001
|
|
From: Govindaraj Saminathan <quic_gsaminat@quicinc.com>
|
|
Date: Fri, 26 May 2023 12:41:06 +0300
|
|
Subject: [PATCH 82/84] wifi: ath11k: remove unused function
|
|
ath11k_tm_event_wmi()
|
|
|
|
The function ath11k_tm_event_wmi() is only defined and it is not used
|
|
anywhere. Hence remove the unused.
|
|
|
|
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1
|
|
|
|
Signed-off-by: Govindaraj Saminathan <quic_gsaminat@quicinc.com>
|
|
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
|
|
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
|
|
Link: https://lore.kernel.org/r/20230517135934.16408-2-quic_rajkbhag@quicinc.com
|
|
---
|
|
drivers/net/wireless/ath/ath11k/testmode.c | 64 +---------------------
|
|
drivers/net/wireless/ath/ath11k/testmode.h | 8 +--
|
|
2 files changed, 2 insertions(+), 70 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ath/ath11k/testmode.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/testmode.c
|
|
@@ -1,6 +1,7 @@
|
|
// SPDX-License-Identifier: BSD-3-Clause-Clear
|
|
/*
|
|
* Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
|
|
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
|
*/
|
|
|
|
#include "testmode.h"
|
|
@@ -20,69 +21,6 @@ static const struct nla_policy ath11k_tm
|
|
[ATH11K_TM_ATTR_VERSION_MINOR] = { .type = NLA_U32 },
|
|
};
|
|
|
|
-/* Returns true if callee consumes the skb and the skb should be discarded.
|
|
- * Returns false if skb is not used. Does not sleep.
|
|
- */
|
|
-bool ath11k_tm_event_wmi(struct ath11k *ar, u32 cmd_id, struct sk_buff *skb)
|
|
-{
|
|
- struct sk_buff *nl_skb;
|
|
- bool consumed;
|
|
- int ret;
|
|
-
|
|
- ath11k_dbg(ar->ab, ATH11K_DBG_TESTMODE,
|
|
- "testmode event wmi cmd_id %d skb %pK skb->len %d\n",
|
|
- cmd_id, skb, skb->len);
|
|
-
|
|
- ath11k_dbg_dump(ar->ab, ATH11K_DBG_TESTMODE, NULL, "", skb->data, skb->len);
|
|
-
|
|
- spin_lock_bh(&ar->data_lock);
|
|
-
|
|
- consumed = true;
|
|
-
|
|
- nl_skb = cfg80211_testmode_alloc_event_skb(ar->hw->wiphy,
|
|
- 2 * sizeof(u32) + skb->len,
|
|
- GFP_ATOMIC);
|
|
- if (!nl_skb) {
|
|
- ath11k_warn(ar->ab,
|
|
- "failed to allocate skb for testmode wmi event\n");
|
|
- goto out;
|
|
- }
|
|
-
|
|
- ret = nla_put_u32(nl_skb, ATH11K_TM_ATTR_CMD, ATH11K_TM_CMD_WMI);
|
|
- if (ret) {
|
|
- ath11k_warn(ar->ab,
|
|
- "failed to put testmode wmi event cmd attribute: %d\n",
|
|
- ret);
|
|
- kfree_skb(nl_skb);
|
|
- goto out;
|
|
- }
|
|
-
|
|
- ret = nla_put_u32(nl_skb, ATH11K_TM_ATTR_WMI_CMDID, cmd_id);
|
|
- if (ret) {
|
|
- ath11k_warn(ar->ab,
|
|
- "failed to put testmode wmi even cmd_id: %d\n",
|
|
- ret);
|
|
- kfree_skb(nl_skb);
|
|
- goto out;
|
|
- }
|
|
-
|
|
- ret = nla_put(nl_skb, ATH11K_TM_ATTR_DATA, skb->len, skb->data);
|
|
- if (ret) {
|
|
- ath11k_warn(ar->ab,
|
|
- "failed to copy skb to testmode wmi event: %d\n",
|
|
- ret);
|
|
- kfree_skb(nl_skb);
|
|
- goto out;
|
|
- }
|
|
-
|
|
- cfg80211_testmode_event(nl_skb, GFP_ATOMIC);
|
|
-
|
|
-out:
|
|
- spin_unlock_bh(&ar->data_lock);
|
|
-
|
|
- return consumed;
|
|
-}
|
|
-
|
|
static int ath11k_tm_cmd_get_version(struct ath11k *ar, struct nlattr *tb[])
|
|
{
|
|
struct sk_buff *skb;
|
|
--- a/drivers/net/wireless/ath/ath11k/testmode.h
|
|
+++ b/drivers/net/wireless/ath/ath11k/testmode.h
|
|
@@ -1,24 +1,18 @@
|
|
/* SPDX-License-Identifier: BSD-3-Clause-Clear */
|
|
/*
|
|
* Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
|
|
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
|
*/
|
|
|
|
#include "core.h"
|
|
|
|
#ifdef CPTCFG_NL80211_TESTMODE
|
|
|
|
-bool ath11k_tm_event_wmi(struct ath11k *ar, u32 cmd_id, struct sk_buff *skb);
|
|
int ath11k_tm_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
|
|
void *data, int len);
|
|
|
|
#else
|
|
|
|
-static inline bool ath11k_tm_event_wmi(struct ath11k *ar, u32 cmd_id,
|
|
- struct sk_buff *skb)
|
|
-{
|
|
- return false;
|
|
-}
|
|
-
|
|
static inline int ath11k_tm_cmd(struct ieee80211_hw *hw,
|
|
struct ieee80211_vif *vif,
|
|
void *data, int len)
|