From owner-svn-src-all@FreeBSD.ORG Thu Feb 17 13:02:01 2011 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CAD911065670; Thu, 17 Feb 2011 13:02:01 +0000 (UTC) (envelope-from ajacoutot@bsdfrog.org) Received: from kirk-ext.obspm.fr (kirk-ext.obspm.fr [145.238.193.7]) by mx1.freebsd.org (Postfix) with ESMTP id 6D0F98FC16; Thu, 17 Feb 2011 13:02:01 +0000 (UTC) Received: from janus.obspm.bsdfrog.org (janus.obspm.bsdfrog.org [145.238.209.41]) by kirk-ext.obspm.fr (8.14.3/8.14.3/DIO Observatoire de Paris - 15/04/10) with ESMTP id p1HD1vNG017546 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 17 Feb 2011 14:02:00 +0100 Received: from janus.obspm.bsdfrog.org (localhost [127.0.0.1]) by janus.obspm.bsdfrog.org (8.14.3/8.14.3) with ESMTP id p1HCZuoN005330; Thu, 17 Feb 2011 13:35:56 +0100 (CET) Received: (from root@localhost) by janus.obspm.bsdfrog.org (8.14.3/8.14.3/Submit) id p1HCZueu022663; Thu, 17 Feb 2011 13:35:56 +0100 (CET) Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by janus.obspm.bsdfrog.org Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id 692CB1A4ACD; Tue, 15 Feb 2011 13:29:58 +0000 (UTC) Received: from hub.freebsd.org (localhost [127.0.0.1]) by hub.freebsd.org (Postfix) with ESMTP id 734C010656AB; Tue, 15 Feb 2011 13:29:56 +0000 (UTC) (envelope-from 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 7E5C2106566B; Tue, 15 Feb 2011 13:29:52 +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 6CF2B8FC14; Tue, 15 Feb 2011 13:29:52 +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 p1FDTqGG032670; Tue, 15 Feb 2011 13:29:52 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1FDTqAC032668; Tue, 15 Feb 2011 13:29:52 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201102151329.p1FDTqAC032668@svn.freebsd.org> From: Adrian Chadd Date: Tue, 15 Feb 2011 13:29:52 +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 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Sender: owner-svn-src-head@FreeBSD.org Errors-To: owner-svn-src-head@FreeBSD.org X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.3.4 (kirk-ext.obspm.fr [145.238.193.20]); Thu, 17 Feb 2011 14:02:00 +0100 (CET) X-Virus-Scanned: clamav-milter 0.96.5 at kirk-ext.obspm.fr X-Virus-Status: Clean Cc: Subject: svn commit: r218708 - head/sys/dev/ath/ath_hal/ar9002 X-BeenThere: svn-src-all@freebsd.org List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Feb 2011 13:02:02 -0000 Author: adrian Date: Tue Feb 15 13:29:52 2011 New Revision: 218708 URL: http://svn.freebsd.org/changeset/base/218708 Log: Disable flipping antennas for AR9280. Flipping antennas when doing 11n would cause all kinds of strange issues. Just don't do it for now and when it comes time to do it, don't do it here. Modified: head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c Modified: head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c Tue Feb 15 12:42:18 2011 (r218707) +++ head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c Tue Feb 15 13:29:52 2011 (r218708) @@ -705,11 +705,18 @@ ar9280FillCapabilityInfo(struct ath_hal return AH_TRUE; } +/* + * This has been disabled - having the HAL flip chainmasks on/off + * when attempting to implement 11n disrupts things. For now, just + * leave this flipped off and worry about implementing TX diversity + * for legacy and MCS0-7 when 11n is fully functioning. + */ HAL_BOOL ar9280SetAntennaSwitch(struct ath_hal *ah, HAL_ANT_SETTING settings) { #define ANTENNA0_CHAINMASK 0x1 #define ANTENNA1_CHAINMASK 0x2 +#if 0 struct ath_hal_5416 *ahp = AH5416(ah); /* Antenna selection is done by setting the tx/rx chainmasks approp. */ @@ -736,6 +743,7 @@ ar9280SetAntennaSwitch(struct ath_hal *a HALDEBUG(ah, HAL_DEBUG_ANY, "%s: settings=%d, tx/rx chainmask=%d/%d\n", __func__, settings, ahp->ah_tx_chainmask, ahp->ah_rx_chainmask); +#endif return AH_TRUE; #undef ANTENNA0_CHAINMASK #undef ANTENNA1_CHAINMASK _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org"