svn commit: r209694 - stable/8/sys/dev/iwn

[Bernhard Schmidt]

Author: bschmidt
Date: Sun Jul  4 12:30:55 2010
New Revision: 209694
URL: http://svn.freebsd.org/changeset/base/209694

Log:
  MFC r209169:
  Fix TX retry rate handling. tx->linkq is an index to a rate table
  beginning with the highest available rate. Currently we always use
  54m for the first retry no matter what AMRR has choosen. Fix this
  by setting the index to the next lower rate.
  
  Approved by:	rpaulo (mentor)
  Tested by:	Brandon Gooch <jamesbrandongooch at gmail.com>

Modified:
  stable/8/sys/dev/iwn/if_iwn.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/iwn/if_iwn.c
==============================================================================
--- stable/8/sys/dev/iwn/if_iwn.c	Sun Jul  4 12:28:02 2010	(r209693)
+++ stable/8/sys/dev/iwn/if_iwn.c	Sun Jul  4 12:30:55 2010	(r209694)
@@ -3007,7 +3007,7 @@ iwn_tx_data(struct iwn_softc *sc, struct
 		txant = IWN_LSB(sc->txchainmask);
 		tx->rflags |= IWN_RFLAG_ANT(txant);
 	} else {
-		tx->linkq = 0;
+		tx->linkq = IWN_RIDX_OFDM54 - ridx;
 		flags |= IWN_TX_LINKQ;	/* enable MRR */
 	}