From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 30 Sep 2011 18:52:16 +0000 (-0400)
Subject: Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into... 
X-Git-Tag: master-2011-11-08~270
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=8e00f5fbb4ecbc3431fa686cba60cd76a62604af;p=~andy%2Flinux

Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/wl12xx/main.c
---

8e00f5fbb4ecbc3431fa686cba60cd76a62604af
diff --cc net/mac80211/ibss.c
index 4f9235b18a0,7809895df8b..41f16dd1a2b
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@@ -81,10 -81,10 +81,10 @@@ static void __ieee80211_sta_join_ibss(s
  	lockdep_assert_held(&ifibss->mtx);
  
  	/* Reset own TSF to allow time synchronization work. */
- 	drv_reset_tsf(local);
+ 	drv_reset_tsf(local, sdata);
  
  	skb = ifibss->skb;
 -	rcu_assign_pointer(ifibss->presp, NULL);
 +	RCU_INIT_POINTER(ifibss->presp, NULL);
  	synchronize_rcu();
  	skb->data = skb->head;
  	skb->len = 0;