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>

diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c
index 6ffe4837bbdb10e68f55af3ffc3ec86f2dd651d1..b47b06bd680f73900f18645c7b5a32d04fdb0628 100644 (file)
--- a/drivers/net/wireless/quantenna/qtnfmac/commands.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c
@@ -187,7 +187,8 @@ static bool qtnf_cmd_start_ap_can_fit(const struct qtnf_vif *vif,
                len += sizeof(struct qlink_tlv_chandef);
 
        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)) {
                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 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;
        int ret;
 
        cmd_skb = qtnf_cmd_alloc_new_cmdskb(vif->mac->macid, vif->vifid,
                                            QLINK_CMD_SET_MAC_ACL,
-                                           sizeof(*cmd) +
-                                           qtnf_cmd_acl_data_size(params));
+                                           sizeof(struct qlink_cmd));
        if (unlikely(!cmd_skb))
                return -ENOMEM;
 
-       cmd = (struct qlink_cmd_set_mac_acl *)cmd_skb->data;
-       qlink_acl_data_cfg2q(params, &cmd->acl);
+       tlv = skb_put(cmd_skb, sizeof(*tlv) + acl_size);
+       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);
        ret = qtnf_cmd_send(bus, cmd_skb, &res_code);

diff --git a/drivers/net/wireless/quantenna/qtnfmac/qlink.h b/drivers/net/wireless/quantenna/qtnfmac/qlink.h
index 6a1f960228a13eedcff54d213db9a1add4c026d5..f4d49565161e262d425d094e08f1b020d4aca952 100644 (file)
--- a/drivers/net/wireless/quantenna/qtnfmac/qlink.h
+++ b/drivers/net/wireless/quantenna/qtnfmac/qlink.h
@@ -663,16 +663,6 @@ struct qlink_acl_data {
        struct qlink_mac_address mac_addrs[0];
 } __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
  */