2009-12-02 14:30:06

by Holger Schurig

[permalink] [raw]
Subject: [PATCH 05/10] libertas: move mesh SSID initialization into mesh.c

Signed-off-by: Holger Schurig <[email protected]>


--- linux-wl.orig/drivers/net/wireless/libertas/main.c
+++ linux-wl/drivers/net/wireless/libertas/main.c
@@ -999,10 +999,6 @@ struct lbs_private *lbs_add_card(void *c
INIT_WORK(&priv->mcast_work, lbs_set_mcast_worker);
INIT_WORK(&priv->sync_channel, lbs_sync_channel_worker);

- priv->mesh_open = 0;
- sprintf(priv->mesh_ssid, "mesh");
- priv->mesh_ssid_len = 4;
-
priv->wol_criteria = 0xffffffff;
priv->wol_gpio = 0xff;

--- linux-wl.orig/drivers/net/wireless/libertas/mesh.c
+++ linux-wl/drivers/net/wireless/libertas/mesh.c
@@ -237,6 +237,9 @@ int lbs_init_mesh(struct lbs_private *pr


if (priv->mesh_tlv) {
+ sprintf(priv->mesh_ssid, "mesh");
+ priv->mesh_ssid_len = 4;
+
lbs_add_mesh(priv);

if (device_create_file(&dev->dev, &dev_attr_lbs_mesh))

--