From owner-svn-src-stable-8@FreeBSD.ORG Tue May 18 17:43:54 2010 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D6BC1065675; Tue, 18 May 2010 17:43:54 +0000 (UTC) (envelope-from bschmidt@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3B9E08FC14; Tue, 18 May 2010 17:43:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4IHhrQv021498; Tue, 18 May 2010 17:43:53 GMT (envelope-from bschmidt@svn.freebsd.org) Received: (from bschmidt@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4IHhrqF021496; Tue, 18 May 2010 17:43:53 GMT (envelope-from bschmidt@svn.freebsd.org) Message-Id: <201005181743.o4IHhrqF021496@svn.freebsd.org> From: Bernhard Schmidt Date: Tue, 18 May 2010 17:43:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r208272 - stable/8/sys/dev/ipw X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2010 17:43:54 -0000 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)