From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 2 Dec 2011 20:44:03 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: v3.3-rc1~182^2~44^2~240
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7a4858c0fde8383f7aa494eda0fba6bef3f2fec;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/libertas/cfg.c
---

d7a4858c0fde8383f7aa494eda0fba6bef3f2fec
diff --cc drivers/net/wireless/libertas/cfg.c
index 89f34ad,a7f1ab2..d1d84e0
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@@ -633,9 -632,9 +633,9 @@@ static int lbs_ret_scan(struct lbs_priv
  				     LBS_SCAN_RSSI_TO_MBM(rssi)/100);
  
  			if (channel &&
 -			    !(channel->flags & IEEE80211_CHAN_DISABLED))
 -				cfg80211_inform_bss(wiphy, channel,
 +			    !(channel->flags & IEEE80211_CHAN_DISABLED)) {
 +				bss = cfg80211_inform_bss(wiphy, channel,
- 					bssid, le64_to_cpu(*(__le64 *)tsfdesc),
+ 					bssid, get_unaligned_le64(tsfdesc),
  					capa, intvl, ie, ielen,
  					LBS_SCAN_RSSI_TO_MBM(rssi),
  					GFP_KERNEL);
diff --cc drivers/net/wireless/p54/p54spi.c
index 5465513,78d0d69..7faed62
--- a/drivers/net/wireless/p54/p54spi.c
+++ b/drivers/net/wireless/p54/p54spi.c
@@@ -581,11 -581,13 +581,9 @@@ static void p54spi_op_stop(struct ieee8
  	struct p54s_priv *priv = dev->priv;
  	unsigned long flags;
  
 -	if (mutex_lock_interruptible(&priv->mutex)) {
 -		/* FIXME: how to handle this error? */
 -		return;
 -	}
 -
 +	mutex_lock(&priv->mutex);
  	WARN_ON(priv->fw_state != FW_STATE_READY);
  
- 	cancel_work_sync(&priv->work);
- 
  	p54spi_power_off(priv);
  	spin_lock_irqsave(&priv->tx_lock, flags);
  	INIT_LIST_HEAD(&priv->tx_pending);
diff --cc net/mac80211/agg-tx.c
index 266cc87,331472c..2c2e951
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@@ -177,10 -183,7 +185,8 @@@ int ___ieee80211_stop_tx_ba_session(str
  	       sta->sta.addr, tid);
  #endif /* CONFIG_MAC80211_HT_DEBUG */
  
- 	set_bit(HT_AGG_STATE_STOPPING, &tid_tx->state);
- 
  	del_timer_sync(&tid_tx->addba_resp_timer);
 +	del_timer_sync(&tid_tx->session_timer);
  
  	/*
  	 * After this packets are no longer handed right through