From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "John W. Linville" <linville@tuxdriver•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Christian Lamparter <chunkeey@googlemail•com>,
Johannes Berg <johannes.berg@intel•com>
Subject: linux-next: manual merge of the wireless tree with the wireless-current tree
Date: Mon, 30 Aug 2010 11:58:50 +1000 [thread overview]
Message-ID: <20100830115850.81829b70.sfr@canb.auug.org.au> (raw)
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
net/mac80211/main.c between commit
95fed448c6d7dac3fb36847cda7094f3524a6cb7 ("mac80211: delete work timer")
from the wireless-current tree and commit
258086a48b766d12a500f98834654ffa927ca475 ("mac80211: cancel restart_work
in ieee80211_unregister_hw") from the wireless tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc net/mac80211/main.c
index ea433b6,93194f6..0000000
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@@ -807,12 -844,7 +844,13 @@@ void ieee80211_unregister_hw(struct iee
rtnl_unlock();
+ /*
+ * Now all work items will be gone, but the
+ * timer might still be armed, so delete it
+ */
+ del_timer_sync(&local->work_timer);
+
+ cancel_work_sync(&local->restart_work);
cancel_work_sync(&local->reconfig_filter);
ieee80211_clear_tx_pending(local);
next reply other threads:[~2010-08-30 1:58 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-30 1:58 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-09-28 3:19 linux-next: manual merge of the wireless tree with the wireless-current tree Stephen Rothwell
2011-09-28 9:10 ` Jouni Malinen
2011-09-14 3:05 Stephen Rothwell
2011-06-21 1:49 Stephen Rothwell
2011-06-21 18:05 ` Gustavo F. Padovan
2011-04-05 2:21 Stephen Rothwell
2011-04-05 2:21 Stephen Rothwell
2010-12-14 2:22 Stephen Rothwell
2010-04-09 1:05 Stephen Rothwell
2010-04-07 2:58 Stephen Rothwell
2010-04-07 14:44 ` John W. Linville
2010-04-07 15:31 ` Stephen Rothwell
2010-04-07 23:19 ` David Miller
2010-04-01 1:59 Stephen Rothwell
2010-04-01 11:43 ` John W. Linville
2010-03-11 2:15 Stephen Rothwell
2010-03-11 2:38 ` Bruno Randolf
2010-03-11 3:04 ` Stephen Rothwell
2010-02-23 1:26 Stephen Rothwell
2009-11-24 3:11 Stephen Rothwell
2009-11-24 15:05 ` John W. Linville
2009-07-09 1:40 Stephen Rothwell
2009-04-22 1:32 Stephen Rothwell
2009-04-22 18:23 ` reinette chatre
2009-04-22 18:38 ` John W. Linville
2009-02-19 5:27 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=20100830115850.81829b70.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=chunkeey@googlemail$(echo .)com \
--cc=johannes.berg@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(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