libertas: use mesh_wdev->ssid instead of priv->mesh_ssid

With the commit e86dc1ca4676 ("Libertas: cfg80211 support") we've lost
the ability to actually set the Mesh SSID from userspace.
NL80211_CMD_SET_INTERFACE with NL80211_ATTR_MESH_ID sets the mesh point
interface's ssid field. Let's use that one for the Libertas Mesh
operation

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/marvell/libertas/dev.h b/drivers/net/wireless/marvell/libertas/dev.h
index 469134930026520bd6253ecee125af5cccee19b3..4b6e05a8e5d54be6c95e7750dab7711c009bba5e 100644 (file)
--- a/drivers/net/wireless/marvell/libertas/dev.h
+++ b/drivers/net/wireless/marvell/libertas/dev.h
@@ -58,8 +58,6 @@ struct lbs_private {
 #ifdef CONFIG_LIBERTAS_MESH
        struct lbs_mesh_stats mstats;
        uint16_t mesh_tlv;
-       u8 mesh_ssid[IEEE80211_MAX_SSID_LEN + 1];
-       u8 mesh_ssid_len;
        u8 mesh_channel;
 #endif
 

diff --git a/drivers/net/wireless/marvell/libertas/mesh.c b/drivers/net/wireless/marvell/libertas/mesh.c
index 2315fdff56c2f9e6466138544592ff6e1900d5cc..2747c957d18c95e4ccfdb7004c3a48ea9b41bed9 100644 (file)
--- a/drivers/net/wireless/marvell/libertas/mesh.c
+++ b/drivers/net/wireless/marvell/libertas/mesh.c
@@ -86,6 +86,7 @@ static int lbs_mesh_config_send(struct lbs_private *priv,
 static int lbs_mesh_config(struct lbs_private *priv, uint16_t action,
                uint16_t chan)
 {
+       struct wireless_dev *mesh_wdev;
        struct cmd_ds_mesh_config cmd;
        struct mrvl_meshie *ie;
 
@@ -105,10 +106,17 @@ static int lbs_mesh_config(struct lbs_private *priv, uint16_t action,
                ie->val.active_protocol_id = MARVELL_MESH_PROTO_ID_HWMP;
                ie->val.active_metric_id = MARVELL_MESH_METRIC_ID;
                ie->val.mesh_capability = MARVELL_MESH_CAPABILITY;
-               ie->val.mesh_id_len = priv->mesh_ssid_len;
-               memcpy(ie->val.mesh_id, priv->mesh_ssid, priv->mesh_ssid_len);
+
+               if (priv->mesh_dev) {
+                       mesh_wdev = priv->mesh_dev->ieee80211_ptr;
+                       ie->val.mesh_id_len = mesh_wdev->mesh_id_up_len;
+                       memcpy(ie->val.mesh_id, mesh_wdev->ssid,
+                                               mesh_wdev->mesh_id_up_len);
+               }
+
                ie->len = sizeof(struct mrvl_meshie_val) -
-                       IEEE80211_MAX_SSID_LEN + priv->mesh_ssid_len;
+                       IEEE80211_MAX_SSID_LEN + ie->val.mesh_id_len;
+
                cmd.length = cpu_to_le16(sizeof(struct mrvl_meshie_val));
                break;
        case CMD_ACT_MESH_CONFIG_STOP:
@@ -117,8 +125,8 @@ static int lbs_mesh_config(struct lbs_private *priv, uint16_t action,
                return -1;
        }
        lbs_deb_cmd("mesh config action %d type %x channel %d SSID %*pE\n",
-                   action, priv->mesh_tlv, chan, priv->mesh_ssid_len,
-                   priv->mesh_ssid);
+                   action, priv->mesh_tlv, chan, ie->val.mesh_id_len,
+                   ie->val.mesh_id);
 
        return __lbs_mesh_config_send(priv, &cmd, action, priv->mesh_tlv);
 }
@@ -863,12 +871,6 @@ int lbs_init_mesh(struct lbs_private *priv)
        /* Stop meshing until interface is brought up */
        lbs_mesh_config(priv, CMD_ACT_MESH_CONFIG_STOP, 1);
 
-       if (priv->mesh_tlv) {
-               sprintf(priv->mesh_ssid, "mesh");
-               priv->mesh_ssid_len = 4;
-               ret = 1;
-       }
-
        return ret;
 }
 
@@ -997,6 +999,13 @@ static int lbs_add_mesh(struct lbs_private *priv)
 
        mesh_wdev->iftype = NL80211_IFTYPE_MESH_POINT;
        mesh_wdev->wiphy = priv->wdev->wiphy;
+
+       if (priv->mesh_tlv) {
+               sprintf(mesh_wdev->ssid, "mesh");
+               mesh_wdev->mesh_id_up_len = 4;
+               ret = 1;
+       }
+
        mesh_wdev->netdev = mesh_dev;
 
        mesh_dev->ml_priv = priv;

diff --git a/drivers/net/wireless/marvell/libertas/mesh.h b/drivers/net/wireless/marvell/libertas/mesh.h
index dfe22c91aade03122db5bcc4d09dd8ce56089e94..1561018f226fd14a932411b74a7f70a7c5e8d51f 100644 (file)
--- a/drivers/net/wireless/marvell/libertas/mesh.h
+++ b/drivers/net/wireless/marvell/libertas/mesh.h
@@ -24,8 +24,7 @@ void lbs_remove_mesh(struct lbs_private *priv);
 
 static inline bool lbs_mesh_activated(struct lbs_private *priv)
 {
-       /* Mesh SSID is only programmed after successful init */
-       return priv->mesh_ssid_len != 0;
+       return !!priv->mesh_tlv;
 }
 
 int lbs_mesh_set_channel(struct lbs_private *priv, u8 channel);