svn commit: r301132 - head/sys/dev/urtwn

[Andriy Voskoboinyk]

Author: avos
Date: Wed Jun  1 15:47:19 2016
New Revision: 301132
URL: https://svnweb.freebsd.org/changeset/base/301132

Log:
  urtwn: unbreak CTS-to-self protection mode.
  
  Do not set HWRTSEN bit when CTS-to-self is used; CTS2SELF bit triggers
  CTS frame transmission by itself (and it does not work when HWRTSEN bit
  is set).
  
  Tested with:
   * RTL8188CUS, HOSTAP mode (11g)
   * RTL8188EU, STA mode (11g)

Modified:
  head/sys/dev/urtwn/if_urtwn.c

Modified: head/sys/dev/urtwn/if_urtwn.c
==============================================================================
--- head/sys/dev/urtwn/if_urtwn.c	Wed Jun  1 15:39:11 2016	(r301131)
+++ head/sys/dev/urtwn/if_urtwn.c	Wed Jun  1 15:47:19 2016	(r301132)
@@ -2956,8 +2956,7 @@ urtwn_tx_data(struct urtwn_softc *sc, st
 				switch (ic->ic_protmode) {
 				case IEEE80211_PROT_CTSONLY:
 					txd->txdw4 |= htole32(
-					    R92C_TXDW4_CTS2SELF |
-					    R92C_TXDW4_HWRTSEN);
+					    R92C_TXDW4_CTS2SELF);
 					break;
 				case IEEE80211_PROT_RTSCTS:
 					txd->txdw4 |= htole32(
@@ -3118,11 +3117,10 @@ urtwn_tx_raw(struct urtwn_softc *sc, str
 		    params->ibp_try0));
 	}
 	if (params->ibp_flags & IEEE80211_BPF_RTS)
-		txd->txdw4 |= htole32(R92C_TXDW4_RTSEN);
+		txd->txdw4 |= htole32(R92C_TXDW4_RTSEN | R92C_TXDW4_HWRTSEN);
 	if (params->ibp_flags & IEEE80211_BPF_CTS)
 		txd->txdw4 |= htole32(R92C_TXDW4_CTS2SELF);
 	if (txd->txdw4 & htole32(R92C_TXDW4_RTSEN | R92C_TXDW4_CTS2SELF)) {
-		txd->txdw4 |= htole32(R92C_TXDW4_HWRTSEN);
 		txd->txdw4 |= htole32(SM(R92C_TXDW4_RTSRATE,
 		    URTWN_RIDX_OFDM24));
 	}