From owner-freebsd-wireless@FreeBSD.ORG Thu Oct 31 02:30:02 2013 Return-Path: Delivered-To: freebsd-wireless@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3ACC4110 for ; Thu, 31 Oct 2013 02:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0EBF62632 for ; Thu, 31 Oct 2013 02:30:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r9V2U1Xs089126 for ; Thu, 31 Oct 2013 02:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r9V2U1OV089125; Thu, 31 Oct 2013 02:30:01 GMT (envelope-from gnats) Date: Thu, 31 Oct 2013 02:30:01 GMT Message-Id: <201310310230.r9V2U1OV089125@freefall.freebsd.org> To: freebsd-wireless@FreeBSD.org Cc: From: dfilter@FreeBSD.ORG (dfilter service) Subject: Re: kern/183428: commit references a PR X-BeenThere: freebsd-wireless@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: dfilter service List-Id: "Discussions of 802.11 stack, tools device driver development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Oct 2013 02:30:02 -0000 The following reply was made to PR kern/183428; it has been noted by GNATS. From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: kern/183428: commit references a PR Date: Thu, 31 Oct 2013 02:21:56 +0000 (UTC) Author: adrian Date: Thu Oct 31 02:21:48 2013 New Revision: 257415 URL: http://svnweb.freebsd.org/changeset/base/257415 Log: Don't base the rate table selection based on the channel mode; it needs to check whether there are rate entries in there or not. PR: kern/183428 Modified: head/sys/dev/iwn/if_iwn.c Modified: head/sys/dev/iwn/if_iwn.c ============================================================================== --- head/sys/dev/iwn/if_iwn.c Thu Oct 31 02:14:28 2013 (r257414) +++ head/sys/dev/iwn/if_iwn.c Thu Oct 31 02:21:48 2013 (r257415) @@ -4312,6 +4312,7 @@ iwn_set_link_quality(struct iwn_softc *s struct iwn_cmd_link_quality linkq; uint8_t txant; int i, rate, txrate; + int is_11n; DPRINTF(sc, IWN_DEBUG_TRACE, "->%s begin\n", __func__); @@ -4326,15 +4327,25 @@ iwn_set_link_quality(struct iwn_softc *s linkq.ampdu_threshold = 3; linkq.ampdu_limit = htole16(4000); /* 4ms */ + /* + * Are we using 11n rates? Ensure the channel is + * 11n _and_ we have some 11n rates, or don't + * try. + */ + if (IEEE80211_IS_CHAN_HT(ni->ni_chan) && ni->ni_htrates.rs_nrates > 0) + is_11n = 1; + else + is_11n = 0; + /* Start at highest available bit-rate. */ - if (IEEE80211_IS_CHAN_HT(ni->ni_chan)) + if (is_11n) txrate = ni->ni_htrates.rs_nrates - 1; else txrate = rs->rs_nrates - 1; for (i = 0; i < IWN_MAX_TX_RETRIES; i++) { uint32_t plcp; - if (IEEE80211_IS_CHAN_HT(ni->ni_chan)) + if (is_11n) rate = IEEE80211_RATE_MCS | txrate; else rate = RV(rs->rs_rates[txrate]); _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"