aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-12-12 22:50:21 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:07:06 -0800
commit9f4625776f96e26b15d98615337ea5916648b1e8 (patch)
tree3a2f0cce7da181875d7492c63a8f68d9c6005c64 /drivers/net
parentlibertas: add ethtool support for wake-on-lan configuration (diff)
downloadlinux-dev-9f4625776f96e26b15d98615337ea5916648b1e8.tar.xz
linux-dev-9f4625776f96e26b15d98615337ea5916648b1e8.zip
libertas: make lbs_update_channel() function non-static
We'll want to use this for meshfrobbing Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/libertas/assoc.c8
-rw-r--r--drivers/net/wireless/libertas/decl.h1
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index 21a569617421..ff976ebcd014 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -163,7 +163,7 @@ done:
}
-static int update_channel(struct lbs_private *priv)
+int lbs_update_channel(struct lbs_private *priv)
{
int ret;
@@ -184,7 +184,7 @@ void lbs_sync_channel(struct work_struct *work)
sync_channel);
lbs_deb_enter(LBS_DEB_ASSOC);
- if (update_channel(priv) != 0)
+ if (lbs_update_channel(priv))
lbs_pr_info("Channel synchronization failed.");
lbs_deb_leave(LBS_DEB_ASSOC);
}
@@ -196,7 +196,7 @@ static int assoc_helper_channel(struct lbs_private *priv,
lbs_deb_enter(LBS_DEB_ASSOC);
- ret = update_channel(priv);
+ ret = lbs_update_channel(priv);
if (ret < 0) {
lbs_deb_assoc("ASSOC: channel: error getting channel.\n");
}
@@ -220,7 +220,7 @@ static int assoc_helper_channel(struct lbs_private *priv,
/* FIXME: shouldn't need to grab the channel _again_ after setting
* it since the firmware is supposed to return the new channel, but
* whatever... */
- ret = update_channel(priv);
+ ret = lbs_update_channel(priv);
if (ret < 0)
lbs_deb_assoc("ASSOC: channel: error getting channel.\n");
diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h
index 9b0ef166185d..45f081b68706 100644
--- a/drivers/net/wireless/libertas/decl.h
+++ b/drivers/net/wireless/libertas/decl.h
@@ -77,4 +77,5 @@ int lbs_stop_card(struct lbs_private *priv);
int lbs_reset_device(struct lbs_private *priv);
void lbs_host_to_card_done(struct lbs_private *priv);
+int lbs_update_channel(struct lbs_private *priv);
#endif