Cap the number of streams supported to two for now.

I haven't yet reviewed the Intel driver(s) in more depth to see if
there are 1x1 NICs that report they support 2 transmit/receive chains..
if so then we'll have to update this.

Tested:

* Intel 4965, which is a 2x2 device with 3 RX and 2 TX chains.

PR:		kern/181132
This commit is contained in:
Adrian Chadd 2013-08-08 05:52:41 +00:00
parent e7495198d5
commit 4030a4b2a3

View File

@ -638,6 +638,20 @@ iwn_attach(device_t dev)
if (sc->sc_flags & IWN_FLAG_HAS_11N) {
ic->ic_rxstream = sc->nrxchains;
ic->ic_txstream = sc->ntxchains;
/*
* The NICs we currently support cap out at 2x2 support
* separate from the chains being used.
*
* This is a total hack to work around that until some
* per-device method is implemented to return the
* actual stream support.
*/
if (ic->ic_rxstream > 2)
ic->ic_rxstream = 2;
if (ic->ic_txstream > 2)
ic->ic_txstream = 2;
ic->ic_htcaps =
IEEE80211_HTCAP_SMPS_OFF /* SMPS mode disabled */
| IEEE80211_HTCAP_SHORTGI20 /* short GI in 20MHz */