Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (4227f62d) · Commits · e / devices / android_kernel_oneplus_sm7250

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

+1 −20

Original line number	Diff line number	Diff line
		@@ -1353,25 +1353,6 @@ static enum ath9k_pkt_type get_hw_packet_type(struct sk_buff *skb)
		return htype;
		}

		static bool is_pae(struct sk_buff *skb)
		{
		struct ieee80211_hdr *hdr;
		__le16 fc;

		hdr = (struct ieee80211_hdr *)skb->data;
		fc = hdr->frame_control;

		if (ieee80211_is_data(fc)) {
		if (ieee80211_is_nullfunc(fc) \|\|
		/* Port Access Entity (IEEE 802.1X) */
		(skb->protocol == cpu_to_be16(ETH_P_PAE))) {
		return true;
		}
		}

		return false;
		}

		static int get_hw_crypto_keytype(struct sk_buff *skb)
		{
		struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
		@@ -1696,7 +1677,7 @@ static void ath_tx_start_dma(struct ath_softc sc, struct ath_buf bf,
		goto tx_done;
		}

		if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && !is_pae(skb)) {
		if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {
		/*
		* Try aggregation if it's a unicast data frame
		* and the destination is HT capable.

+1 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ void iwl_free_tfds_in_queue(struct iwl_priv *priv,
		if (priv->stations[sta_id].tid[tid].tfds_in_queue >= freed)
		priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;
		else {
		IWL_ERR(priv, "free more than tfds_in_queue (%u:%d)\n",
		IWL_DEBUG_TX(priv, "free more than tfds_in_queue (%u:%d)\n",
		priv->stations[sta_id].tid[tid].tfds_in_queue,
		freed);
		priv->stations[sta_id].tid[tid].tfds_in_queue = 0;

+2 −1

Original line number	Diff line number	Diff line
		@@ -466,6 +466,7 @@ static int wl1251_debugfs_add_files(struct wl1251 *wl)

		void wl1251_debugfs_reset(struct wl1251 *wl)
		{
		if (wl->stats.fw_stats != NULL)
		memset(wl->stats.fw_stats, 0, sizeof(*wl->stats.fw_stats));
		wl->stats.retry_count = 0;
		wl->stats.excessive_retries = 0;