ath11k: add a struct to pass parameters into ath11k_wmi_vdev_up

When setting up a multiple bssid we need to pass additional parameters to
the FW. Doing this as individual parameters would make the call signature
very long. Use an intermediate struct instead and adjust all callees to
make use of it.

Signed-off-by: John Crispin <john@phrozen.org>

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index a5c5e4534a12bfb9be38911f24dc3fad9be7246b..daca5b476dce49177433f5dfdde2b91949ba350c 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -657,9 +657,13 @@ void ath11k_mac_peer_cleanup_all(struct ath11k *ar)
 
 static int ath11k_monitor_vdev_up(struct ath11k *ar, int vdev_id)
 {
+       struct vdev_up_params params = {
+               .vdev_id = vdev_id,
+               .bssid = ar->mac_addr,
+       };
        int ret = 0;
 
-       ret = ath11k_wmi_vdev_up(ar, vdev_id, 0, ar->mac_addr);
+       ret = ath11k_wmi_vdev_up(ar, &params);
        if (ret) {
                ath11k_warn(ar->ab, "failed to put up monitor vdev %i: %d\n",
                            vdev_id, ret);
@@ -725,6 +729,13 @@ static void ath11k_control_beaconing(struct ath11k_vif *arvif,
                                     struct ieee80211_bss_conf *info)
 {
        struct ath11k *ar = arvif->ar;
+       struct ieee80211_vif *parent;
+       struct vdev_up_params params = {
+               .vdev_id = arvif->vdev_id,
+               .bssid = arvif->bssid,
+               .profile_num = info->multi_bssid.count,
+               .profile_idx = info->multi_bssid.index,
+       };
        int ret = 0;
 
        lockdep_assert_held(&arvif->ar->conf_mutex);
@@ -752,9 +763,15 @@ static void ath11k_control_beaconing(struct ath11k_vif *arvif,
        arvif->aid = 0;
 
        ether_addr_copy(arvif->bssid, info->bssid);
+       parent = ieee80211_get_multi_bssid_parent(arvif->vif);
+       if (parent) {
+               struct ath11k_vif *pvif = (struct ath11k_vif *)parent->drv_priv;
+
+               params.trans_bssid = pvif->bssid;
+       }
+
 
-       ret = ath11k_wmi_vdev_up(arvif->ar, arvif->vdev_id, arvif->aid,
-                                arvif->bssid);
+       ret = ath11k_wmi_vdev_up(arvif->ar, &params);
        if (ret) {
                ath11k_warn(ar->ab, "failed to bring up vdev %d: %i\n",
                            arvif->vdev_id, ret);
@@ -1570,6 +1587,11 @@ static void ath11k_bss_assoc(struct ieee80211_hw *hw,
        struct ath11k *ar = hw->priv;
        struct ath11k_vif *arvif = (void *)vif->drv_priv;
        struct peer_assoc_params peer_arg;
+       struct vdev_up_params params = {
+               .vdev_id = arvif->vdev_id,
+               .bssid = bss_conf->bssid,
+               .aid = bss_conf->aid,
+       };
        struct ieee80211_sta *ap_sta;
        int ret;
 
@@ -1618,7 +1640,7 @@ static void ath11k_bss_assoc(struct ieee80211_hw *hw,
        arvif->aid = bss_conf->aid;
        ether_addr_copy(arvif->bssid, bss_conf->bssid);
 
-       ret = ath11k_wmi_vdev_up(ar, arvif->vdev_id, arvif->aid, arvif->bssid);
+       ret = ath11k_wmi_vdev_up(ar, &params);
        if (ret) {
                ath11k_warn(ar->ab, "failed to set vdev %d up: %d\n",
                            arvif->vdev_id, ret);
@@ -4896,6 +4918,8 @@ ath11k_mac_update_vif_chan(struct ath11k *ar,
        /* TODO: Update ar->rx_channel */
 
        for (i = 0; i < n_vifs; i++) {
+               struct vdev_up_params params;
+
                arvif = (void *)vifs[i].vif->drv_priv;
 
                if (WARN_ON(!arvif->is_started))
@@ -4916,8 +4940,10 @@ ath11k_mac_update_vif_chan(struct ath11k *ar,
                        continue;
                }
 
-               ret = ath11k_wmi_vdev_up(arvif->ar, arvif->vdev_id, arvif->aid,
-                                        arvif->bssid);
+               params.vdev_id = arvif->vdev_id,
+               params.bssid = arvif->bssid,
+               params.aid = arvif->aid,
+               ret = ath11k_wmi_vdev_up(arvif->ar, &params);
                if (ret) {
                        ath11k_warn(ab, "failed to bring vdev up %d: %d\n",
                                    arvif->vdev_id, ret);

diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index 90c68d1d9087b9c9297dd3b1dcf7c920a8b25e3f..b7a4913228bc4fdf08d2647000b13f15cf6812aa 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -862,7 +862,7 @@ int ath11k_wmi_vdev_start(struct ath11k *ar, struct wmi_vdev_start_req_arg *arg,
        return ret;
 }
 
-int ath11k_wmi_vdev_up(struct ath11k *ar, u32 vdev_id, u32 aid, const u8 *bssid)
+int ath11k_wmi_vdev_up(struct ath11k *ar, struct vdev_up_params *params)
 {
        struct ath11k_pdev_wmi *wmi = ar->wmi;
        struct wmi_vdev_up_cmd *cmd;
@@ -877,10 +877,14 @@ int ath11k_wmi_vdev_up(struct ath11k *ar, u32 vdev_id, u32 aid, const u8 *bssid)
 
        cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_VDEV_UP_CMD) |
                          FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);
-       cmd->vdev_id = vdev_id;
-       cmd->vdev_assoc_id = aid;
+       cmd->vdev_id = params->vdev_id;
+       cmd->vdev_assoc_id = params->aid;
+       cmd->profile_idx = params->profile_idx;
+       cmd->profile_num = params->profile_num;
 
-       ether_addr_copy(cmd->vdev_bssid.addr, bssid);
+       if (params->trans_bssid)
+               ether_addr_copy(cmd->trans_bssid.addr, params->trans_bssid);
+       ether_addr_copy(cmd->vdev_bssid.addr, params->bssid);
 
        ret = ath11k_wmi_cmd_send(wmi, skb, WMI_VDEV_UP_CMDID);
        if (ret) {
@@ -889,8 +893,9 @@ int ath11k_wmi_vdev_up(struct ath11k *ar, u32 vdev_id, u32 aid, const u8 *bssid)
        }
 
        ath11k_dbg(ar->ab, ATH11K_DBG_WMI,
-                  "WMI mgmt vdev up id 0x%x assoc id %d bssid %pM\n",
-                  vdev_id, aid, bssid);
+                  "WMI mgmt vdev up id 0x%x assoc id %d idx %d num %d bssid %pM trans_bssid %pM\n",
+                  params->vdev_id, params->aid, params->profile_idx, params->profile_num,
+                  params->bssid, params->trans_bssid);
 
        return ret;
 }

diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
index fa6665584cafc4660b5adc94103060d76a1b6989..1a436e1885bc061e652af154dffdbce1f33187f3 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/wmi.h
+++ b/drivers/net/wireless/ath/ath11k/wmi.h
@@ -2453,6 +2453,15 @@ struct wmi_vdev_delete_cmd {
        u32 vdev_id;
 } __packed;
 
+struct vdev_up_params {
+       u32 vdev_id;
+       u16 aid;
+       u32 profile_idx;
+       u32 profile_num;
+       const u8 *bssid;
+       u8 *trans_bssid;
+};
+
 struct wmi_vdev_up_cmd {
        u32 tlv_header;
        u32 vdev_id;
@@ -4845,8 +4854,7 @@ int ath11k_wmi_bcn_tmpl(struct ath11k *ar, u32 vdev_id,
                        struct ieee80211_mutable_offsets *offs,
                        struct sk_buff *bcn);
 int ath11k_wmi_vdev_down(struct ath11k *ar, u8 vdev_id);
-int ath11k_wmi_vdev_up(struct ath11k *ar, u32 vdev_id, u32 aid,
-                      const u8 *bssid);
+int ath11k_wmi_vdev_up(struct ath11k *ar, struct vdev_up_params *params);
 int ath11k_wmi_vdev_stop(struct ath11k *ar, u8 vdev_id);
 int ath11k_wmi_vdev_start(struct ath11k *ar, struct wmi_vdev_start_req_arg *arg,
                          bool restart);