From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Abhijeet Kolekar <abhijeet.kolekar@intel•com>,
"John W. Linville" <linville@tuxdriver•com>,
Reinette Chatre <reinette.chatre@intel•com>
Subject: linux-next: manual merge of the net tree with the tree
Date: Thu, 21 May 2009 14:06:10 +1000 [thread overview]
Message-ID: <20090521140610.551574fc.sfr@canb.auug.org.au> (raw)
Hi David,
Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
fbc9f97bbf5e1eaee562eba93dc60faaff3f3bfa ("iwlwifi: do not cancel delayed
work inside spin_lock_irqsave") from the wireless-current tree and commit
727882d62477ed45d248e8cd6d53cf794537b073 ("iwl3945: use iwl_set_mode in
3945") from the net tree.
I removed iwl{3945,}_set_mode() from and applied the following patch.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 5393fb3..967343a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -2437,13 +2437,6 @@ int iwl_set_mode(struct iwl_priv *priv, int mode)
if (!iwl_is_ready_rf(priv))
return -EAGAIN;
- cancel_delayed_work(&priv->scan_check);
- if (iwl_scan_cancel_timeout(priv, 100)) {
- IWL_WARN(priv, "Aborted scan still in progress after 100ms\n");
- IWL_DEBUG_MAC80211(priv, "leaving - scan abort failed.\n");
- return -EAGAIN;
- }
-
iwlcore_commit_rxon(priv);
return 0;
next reply other threads:[~2009-05-21 4:06 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-21 4:06 Stephen Rothwell [this message]
2009-05-21 22:25 ` linux-next: manual merge of the net tree with the tree David Miller
2009-05-21 22:29 ` David Miller
2009-05-22 0:35 ` John W. Linville
2009-05-22 8:10 ` David Miller
2009-05-22 0:33 ` John W. Linville
-- strict thread matches above, loose matches on Subject: below --
2011-08-22 1:51 Stephen Rothwell
2011-08-23 18:10 ` Niklaus Giger
2011-01-04 2:28 Stephen Rothwell
2010-10-12 0:17 Stephen Rothwell
2010-10-12 3:51 ` Stephen Rothwell
2010-10-12 5:56 ` Stefan Richter
2009-07-13 2:50 Stephen Rothwell
2009-05-08 3:23 Stephen Rothwell
2009-05-08 7:49 ` David Miller
2009-05-08 8:21 ` Eric Dumazet
2009-04-21 1:06 Stephen Rothwell
2009-04-21 1:22 ` Herbert Xu
2009-04-21 8:33 ` David Miller
2009-04-21 11:08 ` Stephen Rothwell
2009-03-20 0:32 Stephen Rothwell
2009-03-20 4:38 ` Pantelis Koukousoulas
2009-03-20 8:24 ` Mark McLoughlin
2009-03-20 9:28 ` David Miller
2009-03-04 2:03 Stephen Rothwell
2009-02-05 3:00 Stephen Rothwell
2009-02-05 2:55 Stephen Rothwell
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=20090521140610.551574fc.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=abhijeet.kolekar@intel$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=reinette.chatre@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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