From owner-svn-src-head@FreeBSD.ORG Fri Mar 25 04:15:31 2011 Return-Path: <owner-svn-src-head@FreeBSD.ORG> Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 45EDF106566C; Fri, 25 Mar 2011 04:15:31 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 360EF8FC0A; Fri, 25 Mar 2011 04:15:31 +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 p2P4FV9Z067082; Fri, 25 Mar 2011 04:15:31 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2P4FVJY067080; Fri, 25 Mar 2011 04:15:31 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201103250415.p2P4FVJY067080@svn.freebsd.org> From: Adrian Chadd <adrian@FreeBSD.org> Date: Fri, 25 Mar 2011 04:15:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219981 - head/sys/dev/ath X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current <svn-src-head.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 25 Mar 2011 04:15:31 -0000 Author: adrian Date: Fri Mar 25 04:15:30 2011 New Revision: 219981 URL: http://svn.freebsd.org/changeset/base/219981 Log: Re-disable the setting of 2040/shortgi bits for now. This seems to work fine for STA but not HT/20 AP mode. Further discussion with net80211 people will need to take place to ensure that the right flags are set based on the negotiated capabilities of the remote peer, rather than whatever the local parameters are. Sending short-gi frames in 20mhz may work on some chips but it certainly isn't supported on anything currently supported by the HAL; and sending HT40 frames in HT20 mode just plain won't work. Modified: head/sys/dev/ath/if_ath_tx_ht.c Modified: head/sys/dev/ath/if_ath_tx_ht.c ============================================================================== --- head/sys/dev/ath/if_ath_tx_ht.c Fri Mar 25 00:45:24 2011 (r219980) +++ head/sys/dev/ath/if_ath_tx_ht.c Fri Mar 25 04:15:30 2011 (r219981) @@ -129,9 +129,9 @@ ath_rateseries_setup(struct ath_softc *s if (flags & (HAL_TXDESC_RTSENA | HAL_TXDESC_CTSENA)) series[i].RateFlags |= HAL_RATESERIES_RTS_CTS; +#if 0 if (ni->ni_htcap & IEEE80211_HTCAP_CHWIDTH40) series[i].RateFlags |= HAL_RATESERIES_2040; - /* * The hardware only supports short-gi in 40mhz mode - * if later hardware supports it in 20mhz mode, be sure @@ -139,6 +139,7 @@ ath_rateseries_setup(struct ath_softc *s */ if (ni->ni_htcap & IEEE80211_HTCAP_SHORTGI40) series[i].RateFlags |= HAL_RATESERIES_HALFGI; +#endif series[i].Rate = rt->info[rix[i]].rateCode;