linux-next: manual merge of the wireless tree with the wireless-current tree

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);
