Commit e4da1a81 authored by Holger Schurig's avatar Holger Schurig Committed by John W. Linville

libertas: move mesh SSID initialization into mesh.c

Signed-off-by: default avatarHolger Schurig <holgerschurig@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cd74468b
...@@ -986,10 +986,6 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev) ...@@ -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_DELAYED_WORK(&priv->scan_work, lbs_scan_worker);
INIT_WORK(&priv->mcast_work, lbs_set_mcast_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_criteria = 0xffffffff;
priv->wol_gpio = 0xff; priv->wol_gpio = 0xff;
......
...@@ -237,6 +237,9 @@ int lbs_init_mesh(struct lbs_private *priv) ...@@ -237,6 +237,9 @@ int lbs_init_mesh(struct lbs_private *priv)
if (priv->mesh_tlv) { if (priv->mesh_tlv) {
sprintf(priv->mesh_ssid, "mesh");
priv->mesh_ssid_len = 4;
lbs_add_mesh(priv); lbs_add_mesh(priv);
if (device_create_file(&dev->dev, &dev_attr_lbs_mesh)) if (device_create_file(&dev->dev, &dev_attr_lbs_mesh))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment