Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/wireless/libertas/main.c

+0 −4
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/libertas/mesh.c

+3 −0
Original line number Diff line number Diff line
@@ -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))