Browse Source

iwlwifi: mvm: don't mess the SNAP header in TSO for non-QoS packets

When we get large sends on non-QoS association, we had a
bug that mangled the SNAP header. Fix that.

Fixes: a6d5e32f247c ("iwlwifi: mvm: send large SKBs to the transport")
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Emmanuel Grumbach 8 years ago
parent
commit
6344436e9d
1 changed files with 6 additions and 4 deletions
  1. 6 4
      drivers/net/wireless/intel/iwlwifi/mvm/tx.c

+ 6 - 4
drivers/net/wireless/intel/iwlwifi/mvm/tx.c

@@ -849,11 +849,13 @@ segment:
 		if (tcp_payload_len > mss) {
 		if (tcp_payload_len > mss) {
 			skb_shinfo(tmp)->gso_size = mss;
 			skb_shinfo(tmp)->gso_size = mss;
 		} else {
 		} else {
-			qc = ieee80211_get_qos_ctl((void *)tmp->data);
+			if (ieee80211_is_data_qos(hdr->frame_control)) {
+				qc = ieee80211_get_qos_ctl((void *)tmp->data);
 
 
-			if (ipv4)
-				ip_send_check(ip_hdr(tmp));
-			*qc &= ~IEEE80211_QOS_CTL_A_MSDU_PRESENT;
+				if (ipv4)
+					ip_send_check(ip_hdr(tmp));
+				*qc &= ~IEEE80211_QOS_CTL_A_MSDU_PRESENT;
+			}
 			skb_shinfo(tmp)->gso_size = 0;
 			skb_shinfo(tmp)->gso_size = 0;
 		}
 		}