Skip to content

Commit

Permalink
libertas: make lbs_sync_channel() static
Browse files Browse the repository at this point in the history
... by moving it into the file where it's sole user resides

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Holger Schurig authored and John W. Linville committed Feb 29, 2008
1 parent 52507c2 commit e226868
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
11 changes: 0 additions & 11 deletions drivers/net/wireless/libertas/assoc.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,17 +181,6 @@ int lbs_update_channel(struct lbs_private *priv)
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,
struct assoc_request * assoc_req)
{
Expand Down
1 change: 0 additions & 1 deletion drivers/net/wireless/libertas/assoc.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@

void lbs_association_worker(struct work_struct *work);
struct assoc_request *lbs_get_association_request(struct lbs_private *priv);
void lbs_sync_channel(struct work_struct *work);

#endif /* _LBS_ASSOC_H */
14 changes: 13 additions & 1 deletion drivers/net/wireless/libertas/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -985,6 +985,18 @@ static void command_timer_fn(unsigned long data)
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)
{
size_t bufsize;
Expand Down Expand Up @@ -1128,7 +1140,7 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev)
priv->work_thread = create_singlethread_workqueue("lbs_worker");
INIT_DELAYED_WORK(&priv->assoc_work, lbs_association_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");
priv->mesh_ssid_len = 4;
Expand Down

0 comments on commit e226868

Please sign in to comment.