---

yaml --- r: 183302 b: refs/heads/master c: e4da1a8 h: refs/heads/master v: v3
git-mirror · Dec 22, 2009 · 608dbf0 · 608dbf0
1 parent 8ffc2ab
commit 608dbf0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd74468b8c56c1a809d9b7f913f11d8181c3a0b2
+refs/heads/master: e4da1a81a967c05dfde6f0498cff1f6fe6683f52
diff --git a/trunk/drivers/net/wireless/libertas/main.c b/trunk/drivers/net/wireless/libertas/main.c
@@ -986,10 +986,6 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev)
 	INIT_DELAYED_WORK(&priv->scan_work, lbs_scan_worker);
 	INIT_WORK(&priv->mcast_work, lbs_set_mcast_worker);
 
-	priv->mesh_open = 0;
-	sprintf(priv->mesh_ssid, "mesh");
-	priv->mesh_ssid_len = 4;
-
 	priv->wol_criteria = 0xffffffff;
 	priv->wol_gpio = 0xff;
 

diff --git a/trunk/drivers/net/wireless/libertas/mesh.c b/trunk/drivers/net/wireless/libertas/mesh.c
@@ -237,6 +237,9 @@ int lbs_init_mesh(struct lbs_private *priv)
 
 
 	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))