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

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

libertas: make lbs_sync_channel() static 



... by moving it into the file where it's sole user resides

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 52507c20

drivers/net/wireless/libertas/assoc.c

+0 −11
Original line number Original line Diff line number Diff line
@@ -181,17 +181,6 @@ int lbs_update_channel(struct lbs_private *priv) 
	return ret;

	return ret;

}

}





void lbs_sync_channel(struct work_struct *work)

{

	struct lbs_private *priv = container_of(work, struct lbs_private,

		sync_channel);



	lbs_deb_enter(LBS_DEB_ASSOC);

	if (lbs_update_channel(priv))

		lbs_pr_info("Channel synchronization failed.");

	lbs_deb_leave(LBS_DEB_ASSOC);

}



static int assoc_helper_channel(struct lbs_private *priv,

static int assoc_helper_channel(struct lbs_private *priv,

                                struct assoc_request * assoc_req)

                                struct assoc_request * assoc_req)

{

{

drivers/net/wireless/libertas/assoc.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -7,6 +7,5 @@ 




void lbs_association_worker(struct work_struct *work);

void lbs_association_worker(struct work_struct *work);

struct assoc_request *lbs_get_association_request(struct lbs_private *priv);

struct assoc_request *lbs_get_association_request(struct lbs_private *priv);

void lbs_sync_channel(struct work_struct *work);





#endif /* _LBS_ASSOC_H */
 
#endif /* _LBS_ASSOC_H */

drivers/net/wireless/libertas/main.c

+13 −1
Original line number Original line Diff line number Diff line
@@ -985,6 +985,18 @@ static void command_timer_fn(unsigned long data) 
	lbs_deb_leave(LBS_DEB_CMD);

	lbs_deb_leave(LBS_DEB_CMD);

}

}





static void lbs_sync_channel_worker(struct work_struct *work)

{

	struct lbs_private *priv = container_of(work, struct lbs_private,

		sync_channel);



	lbs_deb_enter(LBS_DEB_MAIN);

	if (lbs_update_channel(priv))

		lbs_pr_info("Channel synchronization failed.");

	lbs_deb_leave(LBS_DEB_MAIN);

}





static int lbs_init_adapter(struct lbs_private *priv)

static int lbs_init_adapter(struct lbs_private *priv)

{

{

	size_t bufsize;

	size_t bufsize;
@@ -1128,7 +1140,7 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev) 
	priv->work_thread = create_singlethread_workqueue("lbs_worker");

	priv->work_thread = create_singlethread_workqueue("lbs_worker");

	INIT_DELAYED_WORK(&priv->assoc_work, lbs_association_worker);

	INIT_DELAYED_WORK(&priv->assoc_work, lbs_association_worker);

	INIT_DELAYED_WORK(&priv->scan_work, lbs_scan_worker);

	INIT_DELAYED_WORK(&priv->scan_work, lbs_scan_worker);

	INIT_WORK(&priv->sync_channel, lbs_sync_channel);

	INIT_WORK(&priv->sync_channel, lbs_sync_channel_worker);





	sprintf(priv->mesh_ssid, "mesh");

	sprintf(priv->mesh_ssid, "mesh");

	priv->mesh_ssid_len = 4;

	priv->mesh_ssid_len = 4;