openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qtnfmac: remove struct qlink_cmd_set_mac_acl 

TLV is used to pass ACL data to firmware in start_ap cfg80211 callback.
Use the same approach in set_mac_acl cfg80211 callback.

Signed-off-by: Vasily Ulyanov <vulyanov@quantenna.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Vasily Ulyanov 2018-01-22 15:46:24 +03:00 committed by Kalle Valo
parent 8054a275de
commit 33f9899234
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/wireless/quantenna/qtnfmac/commands.c
View File

@ -187,7 +187,8 @@ static bool qtnf_cmd_start_ap_can_fit(const struct qtnf_vif *vif,
len += sizeof(struct qlink_tlv_chandef); len += sizeof(struct qlink_tlv_chandef);
if (s->acl) if (s->acl)
len += qtnf_cmd_acl_data_size(s->acl); len += sizeof(struct qlink_tlv_hdr) +
qtnf_cmd_acl_data_size(s->acl);
if (len > (sizeof(struct qlink_cmd) + QTNF_MAX_CMD_BUF_SIZE)) { if (len > (sizeof(struct qlink_cmd) + QTNF_MAX_CMD_BUF_SIZE)) {
pr_err("VIF%u.%u: can not fit AP settings: %u\n", pr_err("VIF%u.%u: can not fit AP settings: %u\n",
@ -2637,19 +2638,21 @@ int qtnf_cmd_set_mac_acl(const struct qtnf_vif *vif,
{ {
struct qtnf_bus *bus = vif->mac->bus; struct qtnf_bus *bus = vif->mac->bus;
struct sk_buff *cmd_skb; struct sk_buff *cmd_skb;
struct qlink_cmd_set_mac_acl *cmd; struct qlink_tlv_hdr *tlv;
size_t acl_size = qtnf_cmd_acl_data_size(params);
u16 res_code; u16 res_code;
int ret; int ret;
cmd_skb = qtnf_cmd_alloc_new_cmdskb(vif->mac->macid, vif->vifid, cmd_skb = qtnf_cmd_alloc_new_cmdskb(vif->mac->macid, vif->vifid,
QLINK_CMD_SET_MAC_ACL, QLINK_CMD_SET_MAC_ACL,
sizeof(*cmd) + sizeof(struct qlink_cmd));
qtnf_cmd_acl_data_size(params));
if (unlikely(!cmd_skb)) if (unlikely(!cmd_skb))
return -ENOMEM; return -ENOMEM;
cmd = (struct qlink_cmd_set_mac_acl *)cmd_skb->data; tlv = skb_put(cmd_skb, sizeof(*tlv) + acl_size);
qlink_acl_data_cfg2q(params, &cmd->acl); tlv->type = cpu_to_le16(QTN_TLV_ID_ACL_DATA);
tlv->len = cpu_to_le16(acl_size);
qlink_acl_data_cfg2q(params, (struct qlink_acl_data *)tlv->val);
qtnf_bus_lock(bus); qtnf_bus_lock(bus);
ret = qtnf_cmd_send(bus, cmd_skb, &res_code); ret = qtnf_cmd_send(bus, cmd_skb, &res_code);

10
drivers/net/wireless/quantenna/qtnfmac/qlink.h
View File

@ -663,16 +663,6 @@ struct qlink_acl_data {
struct qlink_mac_address mac_addrs[0]; struct qlink_mac_address mac_addrs[0];
} __packed; } __packed;
/**
* struct qlink_cmd_set_mac_acl - data for QLINK_CMD_SET_MAC_ACL command
*
* @acl: ACL data.
*/
struct qlink_cmd_set_mac_acl {
struct qlink_cmd chdr;
struct qlink_acl_data acl;
} __packed;
/* QLINK Command Responses messages related definitions /* QLINK Command Responses messages related definitions
*/ */