From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 Sep 2011 01:26:15 +0000 (+1000)
Subject: Merge remote-tracking branch 'wireless/master'
X-Git-Tag: next-20110930~56
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=09be3fe7d7205c4bb75c140ae98a0d527b6a1e18;p=karo-tx-linux.git

Merge remote-tracking branch 'wireless/master'

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

09be3fe7d7205c4bb75c140ae98a0d527b6a1e18
diff --cc net/mac80211/ibss.c
index 4f9235b18a03,7809895df8b0..41f16dd1a2b0
--- 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;