GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-18 12:45:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ath6kl: send TCMD response through testmode events

Browse source 
ath6kl no longer knows what it is transmitting through
cfg80211_testmode, and simply passes opaque buffers between userspace
and the firmware. Leave the CONT_RX enum for backwards compatibility.

kvalo: change ATH6KL_TM_CMD_RX_REPORT to return -EOPNOTSUPP

Signed-off-by: Thomas Pedersen <twpedersen@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Thomas Pedersen 2011-12-30 01:57:00 -08:00 • committed by Kalle Valo
parent 792ecb3308
commit 4f34dacea1
3 changed files with 23 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
drivers/net/wireless/ath/ath6kl/testmode.c
View file

@ -15,6 +15,7 @@
*/ */
#include "testmode.h" #include "testmode.h"
#include "debug.h"
#include <net/netlink.h> #include <net/netlink.h>
@ -30,7 +31,7 @@ enum ath6kl_tm_attr {
enum ath6kl_tm_cmd { enum ath6kl_tm_cmd {
ATH6KL_TM_CMD_TCMD = 0, ATH6KL_TM_CMD_TCMD = 0,
ATH6KL_TM_CMD_RX_REPORT = 1, ATH6KL_TM_CMD_RX_REPORT = 1, /* not used anymore */
}; };
#define ATH6KL_TM_DATA_MAX_LEN 5000 #define ATH6KL_TM_DATA_MAX_LEN 5000
@ -41,84 +42,33 @@ static const struct nla_policy ath6kl_tm_policy[ATH6KL_TM_ATTR_MAX + 1] = {
.len = ATH6KL_TM_DATA_MAX_LEN }, .len = ATH6KL_TM_DATA_MAX_LEN },
}; };
void ath6kl_tm_rx_report_event(struct ath6kl *ar, void *buf, size_t buf_len) void ath6kl_tm_rx_event(struct ath6kl *ar, void *buf, size_t buf_len)
{ {
if (down_interruptible(&ar->sem)) struct sk_buff *skb;
if (!buf || buf_len == 0)
return; return;
kfree(ar->tm.rx_report); skb = cfg80211_testmode_alloc_event_skb(ar->wiphy, buf_len, GFP_KERNEL);
if (!skb) {
ar->tm.rx_report = kmemdup(buf, buf_len, GFP_KERNEL); ath6kl_warn("failed to allocate testmode rx skb!\n");
ar->tm.rx_report_len = buf_len; return;
up(&ar->sem);
wake_up(&ar->event_wq);
}
static int ath6kl_tm_rx_report(struct ath6kl *ar, void *buf, size_t buf_len,
struct sk_buff *skb)
{
int ret = 0;
long left;
if (down_interruptible(&ar->sem))
return -ERESTARTSYS;
if (!test_bit(WMI_READY, &ar->flag)) {
ret = -EIO;
goto out;
} }
NLA_PUT_U32(skb, ATH6KL_TM_ATTR_CMD, ATH6KL_TM_CMD_TCMD);
if (test_bit(DESTROY_IN_PROGRESS, &ar->flag)) { NLA_PUT(skb, ATH6KL_TM_ATTR_DATA, buf_len, buf);
ret = -EBUSY; cfg80211_testmode_event(skb, GFP_KERNEL);
goto out; return;
}
if (ath6kl_wmi_test_cmd(ar->wmi, buf, buf_len) < 0) {
up(&ar->sem);
return -EIO;
}
left = wait_event_interruptible_timeout(ar->event_wq,
ar->tm.rx_report != NULL,
WMI_TIMEOUT);
if (left == 0) {
ret = -ETIMEDOUT;
goto out;
} else if (left < 0) {
ret = left;
goto out;
}
if (ar->tm.rx_report == NULL || ar->tm.rx_report_len == 0) {
ret = -EINVAL;
goto out;
}
NLA_PUT(skb, ATH6KL_TM_ATTR_DATA, ar->tm.rx_report_len,
ar->tm.rx_report);
kfree(ar->tm.rx_report);
ar->tm.rx_report = NULL;
out:
up(&ar->sem);
return ret;
nla_put_failure: nla_put_failure:
ret = -ENOBUFS; kfree_skb(skb);
goto out; ath6kl_warn("nla_put failed on testmode rx skb!\n");
} }
int ath6kl_tm_cmd(struct wiphy *wiphy, void *data, int len) int ath6kl_tm_cmd(struct wiphy *wiphy, void *data, int len)
{ {
struct ath6kl *ar = wiphy_priv(wiphy); struct ath6kl *ar = wiphy_priv(wiphy);
struct nlattr *tb[ATH6KL_TM_ATTR_MAX + 1]; struct nlattr *tb[ATH6KL_TM_ATTR_MAX + 1];
int err, buf_len, reply_len; int err, buf_len;
struct sk_buff *skb;
void *buf; void *buf;
err = nla_parse(tb, ATH6KL_TM_ATTR_MAX, data, len, err = nla_parse(tb, ATH6KL_TM_ATTR_MAX, data, len,
@ -143,24 +93,6 @@ int ath6kl_tm_cmd(struct wiphy *wiphy, void *data, int len)
break; break;
case ATH6KL_TM_CMD_RX_REPORT: case ATH6KL_TM_CMD_RX_REPORT:
if (!tb[ATH6KL_TM_ATTR_DATA])
return -EINVAL;
buf = nla_data(tb[ATH6KL_TM_ATTR_DATA]);
buf_len = nla_len(tb[ATH6KL_TM_ATTR_DATA]);
reply_len = nla_total_size(ATH6KL_TM_DATA_MAX_LEN);
skb = cfg80211_testmode_alloc_reply_skb(wiphy, reply_len);
if (!skb)
return -ENOMEM;
err = ath6kl_tm_rx_report(ar, buf, buf_len, skb);
if (err < 0) {
kfree_skb(skb);
return err;
}
return cfg80211_testmode_reply(skb);
default: default:
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }

6
drivers/net/wireless/ath/ath6kl/testmode.h
View file

@ -18,13 +18,13 @@
#ifdef CONFIG_NL80211_TESTMODE #ifdef CONFIG_NL80211_TESTMODE
void ath6kl_tm_rx_report_event(struct ath6kl *ar, void *buf, size_t buf_len); void ath6kl_tm_rx_event(struct ath6kl *ar, void *buf, size_t buf_len);
int ath6kl_tm_cmd(struct wiphy *wiphy, void *data, int len); int ath6kl_tm_cmd(struct wiphy *wiphy, void *data, int len);
#else #else
static inline void ath6kl_tm_rx_report_event(struct ath6kl *ar, void *buf, static inline void ath6kl_tm_rx_event(struct ath6kl *ar, void *buf,
size_t buf_len) size_t buf_len)
{ {
} }

6
drivers/net/wireless/ath/ath6kl/wmi.c
View file

@ -1145,9 +1145,9 @@ static int ath6kl_wmi_bitrate_reply_rx(struct wmi *wmi, u8 *datap, int len)
return 0; return 0;
} }
static int ath6kl_wmi_tcmd_test_report_rx(struct wmi *wmi, u8 *datap, int len) static int ath6kl_wmi_test_rx(struct wmi *wmi, u8 *datap, int len)
{ {
ath6kl_tm_rx_report_event(wmi->parent_dev, datap, len); ath6kl_tm_rx_event(wmi->parent_dev, datap, len);
return 0; return 0;
} }
@ -3402,7 +3402,7 @@ int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb)
break; break;
case WMI_TEST_EVENTID: case WMI_TEST_EVENTID:
ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_TEST_EVENTID\n"); ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_TEST_EVENTID\n");
ret = ath6kl_wmi_tcmd_test_report_rx(wmi, datap, len); ret = ath6kl_wmi_test_rx(wmi, datap, len);
break; break;
case WMI_GET_FIXRATES_CMDID: case WMI_GET_FIXRATES_CMDID:
ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_GET_FIXRATES_CMDID\n"); ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_GET_FIXRATES_CMDID\n");