From owner-svn-src-all@FreeBSD.ORG Thu Mar 3 03:02:06 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 CC718106566C; Thu, 3 Mar 2011 03:02:06 +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 B9BE28FC17; Thu, 3 Mar 2011 03:02:06 +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 p23326xj089306; Thu, 3 Mar 2011 03:02:06 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p233268T089304; Thu, 3 Mar 2011 03:02:06 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201103030302.p233268T089304@svn.freebsd.org> From: Adrian Chadd Date: Thu, 3 Mar 2011 03:02:06 +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: r219214 - head/sys/dev/ath X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list 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, 03 Mar 2011 03:02:06 -0000 Author: adrian Date: Thu Mar 3 03:02:06 2011 New Revision: 219214 URL: http://svn.freebsd.org/changeset/base/219214 Log: Disable trying to do HT/40 and short-GI TX. These flags are just plain wrong - they're the node flags from negotiation, not the configured flags. I'll jump in later on and figure out exactly what should be done to properly set these two flags when in both STA mode (ie, what the AP says is possible and what's configured) and AP mode (ie, where the AP has a configuration, but then negotiates what's possible with each node, so per-node configuration can and will differ.) This allows the 11n 2.4ghz/ht20 mode to associate (but perform poorly still) and exchange MCS rates with atheros reference APs and a Cisco/Linksys E3000 AP. 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 Thu Mar 3 00:43:35 2011 (r219213) +++ head/sys/dev/ath/if_ath_tx_ht.c Thu Mar 3 03:02:06 2011 (r219214) @@ -128,6 +128,7 @@ 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; @@ -138,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; /* the short preamble field is only applicable for non-MCS rates */ @@ -150,7 +152,7 @@ ath_rateseries_setup(struct ath_softc *s ath_computedur_ht(pktlen , series[i].Rate , ic->ic_txstream - , (ni->ni_htcap & IEEE80211_HTCAP_CHWIDTH40) + , 0 /* disable 20/40 for now */ , series[i].RateFlags & HAL_RATESERIES_HALFGI); } else { series[i].PktDuration = ath_hal_computetxtime(ah,