From: Holger Schurig <hs4233@mail.mn-solutions.de>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: libertas-dev@lists.infradead.org, linux-wireless@vger.kernel.org,
Dan Williams <dcbw@redhat.com>
Subject: [PATCH] libertas: make lbs_sync_channel() static
Date: Mon, 28 Jan 2008 17:26:28 +0100 [thread overview]
Message-ID: <200801281726.28434.hs4233@mail.mn-solutions.de> (raw)
... by moving it into the file where it's sole user resides
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Index: wireless-2.6/drivers/net/wireless/libertas/assoc.c
===================================================================
--- wireless-2.6.orig/drivers/net/wireless/libertas/assoc.c 2008-01-18 10:42:26.000000000 +0100
+++ wireless-2.6/drivers/net/wireless/libertas/assoc.c 2008-01-18 10:43:48.000000000 +0100
@@ -179,17 +179,6 @@ int lbs_update_channel(struct lbs_privat
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)
{
Index: wireless-2.6/drivers/net/wireless/libertas/assoc.h
===================================================================
--- wireless-2.6.orig/drivers/net/wireless/libertas/assoc.h 2008-01-18 10:42:26.000000000 +0100
+++ wireless-2.6/drivers/net/wireless/libertas/assoc.h 2008-01-18 10:43:49.000000000 +0100
@@ -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 */
Index: wireless-2.6/drivers/net/wireless/libertas/main.c
===================================================================
--- wireless-2.6.orig/drivers/net/wireless/libertas/main.c 2008-01-18 10:42:26.000000000 +0100
+++ wireless-2.6/drivers/net/wireless/libertas/main.c 2008-01-18 10:43:48.000000000 +0100
@@ -985,6 +985,18 @@ out:
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;
@@ -1128,7 +1140,7 @@ struct lbs_private *lbs_add_card(void *c
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;
next reply other threads:[~2008-01-28 16:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-28 16:26 Holger Schurig [this message]
2008-01-28 16:39 ` [PATCH] libertas: make lbs_sync_channel() static Dan Williams
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200801281726.28434.hs4233@mail.mn-solutions.de \
--to=hs4233@mail.mn-solutions.de \
--cc=dcbw@redhat.com \
--cc=libertas-dev@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox