wl12xx: add wl12xx_cmd_role_start_ibss()

Add wl12xx_cmd_role_start_ibss() implementation and defintion.
This function is used in order to start the IBSS role.

Stopping the IBSS is done by using the same api as stop STA,
so there is no need for a separate function.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

diff --git a/drivers/net/wireless/wl12xx/cmd.c b/drivers/net/wireless/wl12xx/cmd.c
index 261807b..d8c3916 100644 (file)
--- a/drivers/net/wireless/wl12xx/cmd.c
+++ b/drivers/net/wireless/wl12xx/cmd.c
@@ -617,6 +617,7 @@ out:
        return ret;
 }
 
+/* use this function to stop ibss as well */
 int wl12xx_cmd_role_stop_sta(struct wl1271 *wl)
 {
        struct wl12xx_cmd_role_stop *cmd;
@@ -770,6 +771,67 @@ out:
        return ret;
 }
 
+int wl12xx_cmd_role_start_ibss(struct wl1271 *wl)
+{
+       struct wl12xx_cmd_role_start *cmd;
+       struct ieee80211_bss_conf *bss_conf = &wl->vif->bss_conf;
+       int ret;
+
+       cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
+       if (!cmd) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       wl1271_debug(DEBUG_CMD, "cmd role start ibss %d", wl->role_id);
+
+       cmd->role_id = wl->role_id;
+       if (wl->band == IEEE80211_BAND_5GHZ)
+               cmd->band = WL12XX_BAND_5GHZ;
+       cmd->channel = wl->channel;
+       cmd->ibss.basic_rate_set = cpu_to_le32(wl->basic_rate_set);
+       cmd->ibss.beacon_interval = cpu_to_le16(wl->beacon_int);
+       cmd->ibss.dtim_interval = bss_conf->dtim_period;
+       cmd->ibss.ssid_type = WL12XX_SSID_TYPE_ANY;
+       cmd->ibss.ssid_len = wl->ssid_len;
+       memcpy(cmd->ibss.ssid, wl->ssid, wl->ssid_len);
+       memcpy(cmd->ibss.bssid, wl->bssid, ETH_ALEN);
+       cmd->sta.local_rates = cpu_to_le32(wl->rate_set);
+
+       if (wl->sta_hlid == WL12XX_INVALID_LINK_ID) {
+               ret = wl12xx_allocate_link(wl, &wl->sta_hlid);
+               if (ret)
+                       goto out_free;
+       }
+       cmd->ibss.hlid = wl->sta_hlid;
+       cmd->ibss.remote_rates = cpu_to_le32(wl->rate_set);
+
+       wl1271_debug(DEBUG_CMD, "role start: roleid=%d, hlid=%d, session=%d "
+                    "basic_rate_set: 0x%x, remote_rates: 0x%x",
+                    wl->role_id, cmd->sta.hlid, cmd->sta.session,
+                    wl->basic_rate_set, wl->rate_set);
+
+       wl1271_debug(DEBUG_CMD, "wl->bssid = %pM", wl->bssid);
+
+       ret = wl1271_cmd_send(wl, CMD_ROLE_START, cmd, sizeof(*cmd), 0);
+       if (ret < 0) {
+               wl1271_error("failed to initiate cmd role enable");
+               goto err_hlid;
+       }
+
+       goto out_free;
+
+err_hlid:
+       /* clear links on error. */
+       wl12xx_free_link(wl, &wl->sta_hlid);
+
+out_free:
+       kfree(cmd);
+
+out:
+       return ret;
+}
+
 
 /**
  * send test command to firmware

diff --git a/drivers/net/wireless/wl12xx/cmd.h b/drivers/net/wireless/wl12xx/cmd.h
index 740d27e..22c2f37 100644 (file)
--- a/drivers/net/wireless/wl12xx/cmd.h
+++ b/drivers/net/wireless/wl12xx/cmd.h
@@ -44,6 +44,7 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl);
 int wl12xx_cmd_role_stop_sta(struct wl1271 *wl);
 int wl12xx_cmd_role_start_ap(struct wl1271 *wl);
 int wl12xx_cmd_role_stop_ap(struct wl1271 *wl);
+int wl12xx_cmd_role_start_ibss(struct wl1271 *wl);
 int wl1271_cmd_test(struct wl1271 *wl, void *buf, size_t buf_len, u8 answer);
 int wl1271_cmd_interrogate(struct wl1271 *wl, u16 id, void *buf, size_t len);
 int wl1271_cmd_configure(struct wl1271 *wl, u16 id, void *buf, size_t len);