svn commit: r303413 - head/sys/dev/iwm

Imre Vadász ivadasz at FreeBSD.org
Wed Jul 27 20:43:09 UTC 2016


Author: ivadasz
Date: Wed Jul 27 20:43:08 2016
New Revision: 303413
URL: https://svnweb.freebsd.org/changeset/base/303413

Log:
  [iwm] Fix inverted logic in iwm_tx().
  
      The PROT_REQUIRE flag in should be set for data frames above a certain
      length, but we were setting it for !data frames above a certain length,
      which makes no sense at all.
  
      Taken-From: OpenBSD, Linux iwlwifi
  
  Approved by:	adrian (mentor)
  Obtained from:	DragonFlyBSD git 8cc03924a36c572c2908e659e624f44636dc2b33
  Differential Revision:	https://reviews.freebsd.org/D7323

Modified:
  head/sys/dev/iwm/if_iwm.c

Modified: head/sys/dev/iwm/if_iwm.c
==============================================================================
--- head/sys/dev/iwm/if_iwm.c	Wed Jul 27 20:37:32 2016	(r303412)
+++ head/sys/dev/iwm/if_iwm.c	Wed Jul 27 20:43:08 2016	(r303413)
@@ -3344,7 +3344,7 @@ iwm_tx(struct iwm_softc *sc, struct mbuf
 		flags |= IWM_TX_CMD_FLG_ACK;
 	}
 
-	if (type != IEEE80211_FC0_TYPE_DATA
+	if (type == IEEE80211_FC0_TYPE_DATA
 	    && (totlen + IEEE80211_CRC_LEN > vap->iv_rtsthreshold)
 	    && !IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 		flags |= IWM_TX_CMD_FLG_PROT_REQUIRE;


More information about the svn-src-head mailing list