svn commit: r301485 - head/sys/dev/bwn

[Adrian Chadd]

Author: adrian
Date: Mon Jun  6 07:09:02 2016
New Revision: 301485
URL: https://svnweb.freebsd.org/changeset/base/301485

Log:
  [bwn] don't use a 1MB CCK RTS frame for 11a OFDM transmissions.

Modified:
  head/sys/dev/bwn/if_bwn.c

Modified: head/sys/dev/bwn/if_bwn.c
==============================================================================
--- head/sys/dev/bwn/if_bwn.c	Mon Jun  6 06:18:18 2016	(r301484)
+++ head/sys/dev/bwn/if_bwn.c	Mon Jun  6 07:09:02 2016	(r301485)
@@ -6229,7 +6229,6 @@ bwn_set_txhdr(struct bwn_mac *mac, struc
 	else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE)
 		rate = rate_fb = tp->ucastrate;
 	else {
-		/* XXX TODO: don't fall back to CCK rates for OFDM */
 		rix = ieee80211_ratectl_rate(ni, NULL, 0);
 		rate = ni->ni_txrate;
 
@@ -6324,9 +6323,11 @@ bwn_set_txhdr(struct bwn_mac *mac, struc
 		macctl |= BWN_TX_MAC_LONGFRAME;
 
 	if (ic->ic_flags & IEEE80211_F_USEPROT) {
-		/* XXX RTS rate is always 1MB??? */
-		/* XXX TODO: don't fall back to CCK rates for OFDM */
-		rts_rate = BWN_CCK_RATE_1MB;
+		/* Note: don't fall back to CCK rates for 5G */
+		if (phy->gmode)
+			rts_rate = BWN_CCK_RATE_1MB;
+		else
+			rts_rate = BWN_OFDM_RATE_6MB;
 		rts_rate_fb = bwn_get_fbrate(rts_rate);
 
 		/* XXX 'rate' here is hardware rate now, not the net80211 rate */