svn commit: r208272 - stable/8/sys/dev/ipw

[Bernhard Schmidt]

Author: bschmidt
Date: Tue May 18 17:43:53 2010
New Revision: 208272
URL: http://svn.freebsd.org/changeset/base/208272

Log:
  MFC r207926:
  Enable 5.5 and 11Mbit TX rates.
  
  Reviewed by:	sam
  Approved by:	rpaulo (mentor)

Modified:
  stable/8/sys/dev/ipw/if_ipw.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)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/dev/ipw/if_ipw.c
==============================================================================
--- stable/8/sys/dev/ipw/if_ipw.c	Tue May 18 17:15:41 2010	(r208271)
+++ stable/8/sys/dev/ipw/if_ipw.c	Tue May 18 17:43:53 2010	(r208272)
@@ -2505,19 +2505,19 @@ ipw_config(struct ipw_softc *sc)
 	if (error != 0)
 		return error;
 
-	data = htole32(0x3); /* 1, 2 */
+	data = htole32(0xf); /* 1, 2, 5.5, 11 */
 	DPRINTF(("Setting basic tx rates to 0x%x\n", le32toh(data)));
 	error = ipw_cmd(sc, IPW_CMD_SET_BASIC_TX_RATES, &data, sizeof data);
 	if (error != 0)
 		return error;
 
-	/* NB: use the same rate set */
+	/* Use the same rate set */
 	DPRINTF(("Setting msdu tx rates to 0x%x\n", le32toh(data)));
 	error = ipw_cmd(sc, IPW_CMD_SET_MSDU_TX_RATES, &data, sizeof data);
 	if (error != 0)
 		return error;
 
-	data = htole32(0xf); /* 1, 2, 5.5, 11 */
+	/* Use the same rate set */
 	DPRINTF(("Setting tx rates to 0x%x\n", le32toh(data)));
 	error = ipw_cmd(sc, IPW_CMD_SET_TX_RATES, &data, sizeof data);
 	if (error != 0)