svn commit: r230618 - stable/9/sys/dev/iwn

[Bernhard Schmidt]

Author: bschmidt
Date: Fri Jan 27 17:29:59 2012
New Revision: 230618
URL: http://svn.freebsd.org/changeset/base/230618

Log:
  MFC r229375:
  Don't rely on MCS7 being at index 7 while determining the amount
  of antennas to use. Not all APs enable all MCS rates.

Modified:
  stable/9/sys/dev/iwn/if_iwn.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/dev/iwn/if_iwn.c
==============================================================================
--- stable/9/sys/dev/iwn/if_iwn.c	Fri Jan 27 17:16:44 2012	(r230617)
+++ stable/9/sys/dev/iwn/if_iwn.c	Fri Jan 27 17:29:59 2012	(r230618)
@@ -2128,7 +2128,7 @@ iwn_newassoc(struct ieee80211_node *ni, 
 					plcp |= IWN_RFLAG_SGI;
 			} else if (ni->ni_htcap & IEEE80211_HTCAP_SHORTGI20)
 				plcp |= IWN_RFLAG_SGI;
-			if (i > 7)
+			if (RV(ni->ni_htrates.rs_rates[i]) > 7)
 				plcp |= IWN_RFLAG_ANT(txant1 | txant2);
 			else
 				plcp |= IWN_RFLAG_ANT(txant1);