From 875a3b01b233ec72344a1c699bae6bf54c150c7b Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Wed, 12 Dec 2007 22:50:21 -0500 Subject: [PATCH] --- yaml --- r: 79194 b: refs/heads/master c: 9f4625776f96e26b15d98615337ea5916648b1e8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/assoc.c | 8 ++++---- trunk/drivers/net/wireless/libertas/decl.h | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 54d343ae6539..7216462e7866 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 506e9025e030c441679fb1ae77fb0d6266c34443 +refs/heads/master: 9f4625776f96e26b15d98615337ea5916648b1e8 diff --git a/trunk/drivers/net/wireless/libertas/assoc.c b/trunk/drivers/net/wireless/libertas/assoc.c index 21a569617421..ff976ebcd014 100644 --- a/trunk/drivers/net/wireless/libertas/assoc.c +++ b/trunk/drivers/net/wireless/libertas/assoc.c @@ -163,7 +163,7 @@ static int assoc_helper_mode(struct lbs_private *priv, } -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/trunk/drivers/net/wireless/libertas/decl.h b/trunk/drivers/net/wireless/libertas/decl.h index 9b0ef166185d..45f081b68706 100644 --- a/trunk/drivers/net/wireless/libertas/decl.h +++ b/trunk/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