From: "John W. Linville" <linville@tuxdriver.com>
To: Jeff Garzik <jeff@garzik.org>
Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>
Subject: iwlwifi: fix-up merge fall-out after namespace separation
Date: Mon, 17 Dec 2007 21:25:40 -0500 [thread overview]
Message-ID: <20071218022540.GB3640@tuxdriver.com> (raw)
In-Reply-To: <476708EF.10403@garzik.org>
> drivers/net/wireless/iwlwifi/iwl3945-base.c: In function=20
> =E2=80=98iwl3945_alive_start=E2=80=99:
> drivers/net/wireless/iwlwifi/iwl3945-base.c:6285: error: implicit=20
> declaration of function =E2=80=98iwl_rate_control_unregister=E2=80=99
> make[4]: *** [drivers/net/wireless/iwlwifi/iwl3945-base.o] Error 1
> make[3]: *** [drivers/net/wireless/iwlwifi] Error 2
> make[2]: *** [drivers/net/wireless] Error 2
> make[1]: *** [drivers/net] Error 2
> make: *** [drivers] Error 2
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/=
wireless/iwlwifi/iwl3945-base.c
index 42f6623..88cf035 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -4859,7 +4859,7 @@ static void iwl3945_irq_tasklet(struct iwl3945_pr=
iv *priv)
/* Queue restart only if RF_KILL switch was set to "kill"
* when we loaded driver, and is now set to "enable".
* After we're Alive, RF_KILL gets handled by
- * iwl_rx_card_state_notif() */
+ * iwl3945_rx_card_state_notif() */
if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status)) {
clear_bit(STATUS_RF_KILL_HW, &priv->status);
queue_work(priv->workqueue, &priv->restart);
@@ -6282,7 +6282,7 @@ static void iwl3945_alive_start(struct iwl3945_pr=
iv *priv)
mutex_lock(&priv->mutex);
=20
if (rc) {
- iwl_rate_control_unregister(priv->hw);
+ iwl3945_rate_control_unregister(priv->hw);
IWL_ERROR("Failed to register network "
"device (error %d)\n", rc);
return;
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/=
wireless/iwlwifi/iwl4965-base.c
index 0dfc1ac..df6f3b1 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -5229,7 +5229,7 @@ static void iwl4965_irq_tasklet(struct iwl4965_pr=
iv *priv)
/* Queue restart only if RF_KILL switch was set to "kill"
* when we loaded driver, and is now set to "enable".
* After we're Alive, RF_KILL gets handled by
- * iwl_rx_card_state_notif() */
+ * iwl4965_rx_card_state_notif() */
if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status)) {
clear_bit(STATUS_RF_KILL_HW, &priv->status);
queue_work(priv->workqueue, &priv->restart);
@@ -6695,7 +6695,7 @@ static void iwl4965_alive_start(struct iwl4965_pr=
iv *priv)
mutex_lock(&priv->mutex);
=20
if (rc) {
- iwl_rate_control_unregister(priv->hw);
+ iwl4965_rate_control_unregister(priv->hw);
IWL_ERROR("Failed to register network "
"device (error %d)\n", rc);
return;
--=20
John W. Linville
linville@tuxdriver.com
-
To unsubscribe from this list: send the line "unsubscribe linux-wireles=
s" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2007-12-18 2:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-16 4:34 Please pull 'upstream-jgarzik' branch of wireless-2.6 John W. Linville
2007-12-17 23:24 ` Jeff Garzik
2007-12-17 23:40 ` Jeff Garzik
2007-12-18 1:24 ` Zhu Yi
2007-12-18 2:25 ` John W. Linville [this message]
2007-12-18 3:04 ` iwlwifi: fix-up merge fall-out after namespace separation Jeff Garzik
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=20071218022540.GB3640@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=akpm@linux-foundation.org \
--cc=jeff@garzik.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).