From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 26 Apr 2011 19:39:10 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: firefly_0821_release~7613^2~967^2~16^2~280
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=429576b97c623b9c4e3375fb7c37bce377f51e68;p=firefly-linux-kernel-4.4.55.git

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

429576b97c623b9c4e3375fb7c37bce377f51e68
diff --cc drivers/net/wireless/ath/ath9k/mac.c
index d86b8393b8dd,edc1cbbfecaf..c8a4cedce805
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@@ -710,12 -751,20 +710,19 @@@ void ath9k_hw_abortpcurecv(struct ath_h
  }
  EXPORT_SYMBOL(ath9k_hw_abortpcurecv);
  
- bool ath9k_hw_stopdmarecv(struct ath_hw *ah)
+ bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset)
  {
  #define AH_RX_STOP_DMA_TIMEOUT 10000   /* usec */
 -#define AH_RX_TIME_QUANTUM     100     /* usec */
  	struct ath_common *common = ath9k_hw_common(ah);
+ 	u32 mac_status, last_mac_status = 0;
  	int i;
  
+ 	/* Enable access to the DMA observation bus */
+ 	REG_WRITE(ah, AR_MACMISC,
+ 		  ((AR_MACMISC_DMA_OBS_LINE_8 << AR_MACMISC_DMA_OBS_S) |
+ 		   (AR_MACMISC_MISC_OBS_BUS_1 <<
+ 		    AR_MACMISC_MISC_OBS_BUS_MSB_S)));
+ 
  	REG_WRITE(ah, AR_CR, AR_CR_RXD);
  
  	/* Wait for rx enable bit to go low */
diff --cc drivers/net/wireless/ath/ath9k/main.c
index 20a2cf731d83,17d04ff8d678..475009b578de
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@@ -1449,8 -1452,10 +1447,9 @@@ static int ath9k_add_interface(struct i
  	struct ath_softc *sc = hw->priv;
  	struct ath_hw *ah = sc->sc_ah;
  	struct ath_common *common = ath9k_hw_common(ah);
 -	struct ath_vif *avp = (void *)vif->drv_priv;
  	int ret = 0;
  
+ 	ath9k_ps_wakeup(sc);
  	mutex_lock(&sc->mutex);
  
  	switch (vif->type) {
@@@ -2105,7 -1994,14 +2112,8 @@@ static void ath9k_bss_info_changed(stru
  			sc->sc_flags &= ~SC_OP_PROTECT_ENABLE;
  	}
  
 -	if (changed & BSS_CHANGED_ASSOC) {
 -		ath_dbg(common, ATH_DBG_CONFIG, "BSS Changed ASSOC %d\n",
 -			bss_conf->assoc);
 -		ath9k_bss_assoc_info(sc, hw, vif, bss_conf);
 -	}
 -
  	mutex_unlock(&sc->mutex);
+ 	ath9k_ps_restore(sc);
  }
  
  static u64 ath9k_get_tsf(struct ieee80211_hw *hw)
diff --cc net/bluetooth/l2cap_core.c
index d47de2b04b2e,2c8dd4494c63..9e8dc136ef16
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@@ -1079,13 -1051,14 +1079,14 @@@ static void l2cap_retransmit_one_frame(
  	tx_skb = skb_clone(skb, GFP_ATOMIC);
  	bt_cb(skb)->retries++;
  	control = get_unaligned_le16(tx_skb->data + L2CAP_HDR_SIZE);
+ 	control &= L2CAP_CTRL_SAR;
  
 -	if (pi->conn_state & L2CAP_CONN_SEND_FBIT) {
 +	if (chan->conn_state & L2CAP_CONN_SEND_FBIT) {
  		control |= L2CAP_CTRL_FINAL;
 -		pi->conn_state &= ~L2CAP_CONN_SEND_FBIT;
 +		chan->conn_state &= ~L2CAP_CONN_SEND_FBIT;
  	}
  
 -	control |= (pi->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT)
 +	control |= (chan->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT)
  			| (tx_seq << L2CAP_CTRL_TXSEQ_SHIFT);
  
  	put_unaligned_le16(control, tx_skb->data + L2CAP_HDR_SIZE);