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

Author: linvjw

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

@@ -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

@@ -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

@@ -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);