Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b7a5db0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 



John W. Linville says:

====================
A few more late-breaking fixes hoping for 3.10...

Regarding the Bluetooth fix, Gustavo says:

"A important fix to 3.10, this patch fixes an issues that was preventing
the l2cap info response command to be handled properly."

Also for that Bluetooth fix, Johan adds:

"Once the code gives up parsing this PDU it also gives up essential
parts of the L2CAP connection creation process, i.e. without this
patch the stack will fail to establish connections properly."

Moving onto ath9k, Felix Fietkau fixes an RCU locking issue in
the transmit path.  As for ath9k_htc, Sujith Manoharan fixes some
authentication timeouts by ensuring that a chip reset is done when
IDLE is turned off.

I think these are all micro-fixes that shouldn't cause any trouble.
Please let me know if there are problems!
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ab4eb353 9d5c34f5

drivers/net/wireless/ath/ath9k/htc_drv_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1174,7 +1174,7 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed) 
		mutex_lock(&priv->htc_pm_lock);



		priv->ps_idle = !!(conf->flags & IEEE80211_CONF_IDLE);

		if (priv->ps_idle)

		if (!priv->ps_idle)

			chip_reset = true;



		mutex_unlock(&priv->htc_pm_lock);

drivers/net/wireless/ath/ath9k/xmit.c

+5 −1
Original line number Diff line number Diff line
@@ -1570,6 +1570,8 @@ void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq) 
	    txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)

		return;



	rcu_read_lock();



	ac = list_first_entry(&txq->axq_acq, struct ath_atx_ac, list);

	last_ac = list_entry(txq->axq_acq.prev, struct ath_atx_ac, list);
@@ -1608,8 +1610,10 @@ void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq) 


		if (ac == last_ac ||

		    txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)

			return;

			break;

	}



	rcu_read_unlock();

}



/***********/

net/bluetooth/l2cap_core.c

+1 −1
Original line number Diff line number Diff line
@@ -4333,7 +4333,7 @@ static inline int l2cap_information_rsp(struct l2cap_conn *conn, 
	struct l2cap_info_rsp *rsp = (struct l2cap_info_rsp *) data;

	u16 type, result;



	if (cmd_len != sizeof(*rsp))

	if (cmd_len < sizeof(*rsp))

		return -EPROTO;



	type   = __le16_to_cpu(rsp->type);