Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes (5e038890) · Commits · e / devices / android_kernel_samsung_universal8890

drivers/net/wireless/iwlwifi/dvm/tx.c

+9 −5

Original line number	Diff line number	Diff line
		@@ -1291,8 +1291,6 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
		struct iwl_compressed_ba_resp ba_resp = (void )pkt->data;
		struct iwl_ht_agg *agg;
		struct sk_buff_head reclaimed_skbs;
		struct ieee80211_tx_info *info;
		struct ieee80211_hdr *hdr;
		struct sk_buff *skb;
		int sta_id;
		int tid;
		@@ -1379,22 +1377,28 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
		freed = 0;

		skb_queue_walk(&reclaimed_skbs, skb) {
		hdr = (struct ieee80211_hdr *)skb->data;
		struct ieee80211_hdr hdr = (void )skb->data;
		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

		if (ieee80211_is_data_qos(hdr->frame_control))
		freed++;
		else
		WARN_ON_ONCE(1);

		info = IEEE80211_SKB_CB(skb);
		iwl_trans_free_tx_cmd(priv->trans, info->driver_data[1]);

		memset(&info->status, 0, sizeof(info->status));
		/* Packet was transmitted successfully, failures come as single
		* frames because before failing a frame the firmware transmits
		* it without aggregation at least once.
		*/
		info->flags \|= IEEE80211_TX_STAT_ACK;

		if (freed == 1) {
		/* this is the first skb we deliver in this batch */
		/* put the rate scaling data there */
		info = IEEE80211_SKB_CB(skb);
		memset(&info->status, 0, sizeof(info->status));
		info->flags \|= IEEE80211_TX_STAT_ACK;
		info->flags \|= IEEE80211_TX_STAT_AMPDU;
		info->status.ampdu_ack_len = ba_resp->txed_2_done;
		info->status.ampdu_len = ba_resp->txed;

drivers/net/wireless/iwlwifi/mvm/mvm.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -152,7 +152,7 @@ enum iwl_power_scheme {
		IWL_POWER_SCHEME_LP
		};

		#define IWL_CONN_MAX_LISTEN_INTERVAL 70
		#define IWL_CONN_MAX_LISTEN_INTERVAL 10
		#define IWL_UAPSD_AC_INFO (IEEE80211_WMM_IE_STA_QOSINFO_AC_VO \|\
		IEEE80211_WMM_IE_STA_QOSINFO_AC_VI \|\
		IEEE80211_WMM_IE_STA_QOSINFO_AC_BK \|\

drivers/net/wireless/iwlwifi/mvm/tx.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -822,16 +822,12 @@ int iwl_mvm_rx_ba_notif(struct iwl_mvm mvm, struct iwl_rx_cmd_buffer rxb,
		struct iwl_mvm_ba_notif ba_notif = (void )pkt->data;
		struct sk_buff_head reclaimed_skbs;
		struct iwl_mvm_tid_data *tid_data;
		struct ieee80211_tx_info *info;
		struct ieee80211_sta *sta;
		struct iwl_mvm_sta *mvmsta;
		struct ieee80211_hdr *hdr;
		struct sk_buff *skb;
		int sta_id, tid, freed;

		/* "flow" corresponds to Tx queue */
		u16 scd_flow = le16_to_cpu(ba_notif->scd_flow);

		/* "ssn" is start of block-ack Tx window, corresponds to index
		* (in Tx queue's circular buffer) of first TFD/frame in window */
		u16 ba_resp_scd_ssn = le16_to_cpu(ba_notif->scd_ssn);
		@@ -888,22 +884,26 @@ int iwl_mvm_rx_ba_notif(struct iwl_mvm mvm, struct iwl_rx_cmd_buffer rxb,
		freed = 0;

		skb_queue_walk(&reclaimed_skbs, skb) {
		hdr = (struct ieee80211_hdr *)skb->data;
		struct ieee80211_hdr hdr = (void )skb->data;
		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

		if (ieee80211_is_data_qos(hdr->frame_control))
		freed++;
		else
		WARN_ON_ONCE(1);

		info = IEEE80211_SKB_CB(skb);
		iwl_trans_free_tx_cmd(mvm->trans, info->driver_data[1]);

		memset(&info->status, 0, sizeof(info->status));
		/* Packet was transmitted successfully, failures come as single
		* frames because before failing a frame the firmware transmits
		* it without aggregation at least once.
		*/
		info->flags \|= IEEE80211_TX_STAT_ACK;

		if (freed == 1) {
		/* this is the first skb we deliver in this batch */
		/* put the rate scaling data there */
		info = IEEE80211_SKB_CB(skb);
		memset(&info->status, 0, sizeof(info->status));
		info->flags \|= IEEE80211_TX_STAT_ACK;
		info->flags \|= IEEE80211_TX_STAT_AMPDU;
		info->status.ampdu_ack_len = ba_notif->txed_2_done;
		info->status.ampdu_len = ba_notif->txed;