Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (729d8d18) · Commits · e / devices / android_kernel_xiaomi_markw

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

+1 −1

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

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

	mutex_unlock(&priv->htc_pm_lock);		mutex_unlock(&priv->htc_pm_lock);

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1673,6 +1673,8 @@ void ath_txq_schedule(struct ath_softc sc, struct ath_txq txq)
	txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)		txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)
	return;		return;

			rcu_read_lock();

	ac = list_first_entry(&txq->axq_acq, struct ath_atx_ac, list);		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);		last_ac = list_entry(txq->axq_acq.prev, struct ath_atx_ac, list);

	@@ -1711,8 +1713,10 @@ void ath_txq_schedule(struct ath_softc sc, struct ath_txq txq)

	if (ac == last_ac \|\|		if (ac == last_ac \|\|
	txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)		txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)
	return;		break;
	}		}

			rcu_read_unlock();
	}		}

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4334,7 +4334,7 @@ static inline int l2cap_information_rsp(struct l2cap_conn *conn,
	struct l2cap_info_rsp rsp = (struct l2cap_info_rsp ) data;		struct l2cap_info_rsp rsp = (struct l2cap_info_rsp ) data;
	u16 type, result;		u16 type, result;

	if (cmd_len != sizeof(*rsp))		if (cmd_len < sizeof(*rsp))
	return -EPROTO;		return -EPROTO;

	type = __le16_to_cpu(rsp->type);		type = __le16_to_cpu(rsp->type);