From owner-svn-soc-all@FreeBSD.ORG Thu Aug 15 10:18:36 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B4CF5299 for ; Thu, 15 Aug 2013 10:18:36 +0000 (UTC) (envelope-from ccqin@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9562424E5 for ; Thu, 15 Aug 2013 10:18:36 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7FAIaBv082216 for ; Thu, 15 Aug 2013 10:18:36 GMT (envelope-from ccqin@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r7FAIa5S082204 for svn-soc-all@FreeBSD.org; Thu, 15 Aug 2013 10:18:36 GMT (envelope-from ccqin@FreeBSD.org) Date: Thu, 15 Aug 2013 10:18:36 GMT Message-Id: <201308151018.r7FAIa5S082204@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to ccqin@FreeBSD.org using -f From: ccqin@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r255970 - soc2013/ccqin/head/sys/net80211 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Aug 2013 10:18:36 -0000 Author: ccqin Date: Thu Aug 15 10:18:36 2013 New Revision: 255970 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=255970 Log: fix some errors. Modified: soc2013/ccqin/head/sys/net80211/ieee80211_amrr.c soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.c soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.h soc2013/ccqin/head/sys/net80211/ieee80211_ratectl_none.c Modified: soc2013/ccqin/head/sys/net80211/ieee80211_amrr.c ============================================================================== --- soc2013/ccqin/head/sys/net80211/ieee80211_amrr.c Thu Aug 15 09:07:05 2013 (r255969) +++ soc2013/ccqin/head/sys/net80211/ieee80211_amrr.c Thu Aug 15 10:18:36 2013 (r255970) @@ -129,17 +129,6 @@ free(vap->iv_rs, M_80211_RATECTL); } -static int -ieee80211_ratectl_node_is11n(struct ieee80211_node *ni) -{ - - if (ni->ni_chan == NULL) - return (0); - if (ni->ni_chan == IEEE80211_CHAN_ANYC) - return (0); - return (IEEE80211_IS_CHAN_HT(ni->ni_chan)); -} - static void amrr_node_init(struct ieee80211_node *ni, uint32_t capabilities) { Modified: soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.c ============================================================================== --- soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.c Thu Aug 15 09:07:05 2013 (r255969) +++ soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.c Thu Aug 15 10:18:36 2013 (r255970) @@ -124,9 +124,8 @@ struct ieee80211_rc_info *rc_info) { const struct ieee80211_rate_table * rt = NULL; - const struct ieee80211com *ic = ni->ni_ic; struct ieee80211_rc_series *rc = rc_info->ri_rc; - int shortPreamble = rc_info->ri_shortPreamble; + /* int shortPreamble = rc_info->ri_shortPreamble; */ uint8_t rate; int i; Modified: soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.h ============================================================================== --- soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.h Thu Aug 15 09:07:05 2013 (r255969) +++ soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.h Thu Aug 15 10:18:36 2013 (r255970) @@ -251,7 +251,7 @@ return (IEEE80211_IS_CHAN_HT(ni->ni_chan)); } -static const struct ieee80211_rateset * __inline +__inline static const struct ieee80211_rateset * ieee80211_ratectl_get_rateset(const struct ieee80211_node *ni) { return ieee80211_ratectl_node_is11n(ni) ? Modified: soc2013/ccqin/head/sys/net80211/ieee80211_ratectl_none.c ============================================================================== --- soc2013/ccqin/head/sys/net80211/ieee80211_ratectl_none.c Thu Aug 15 09:07:05 2013 (r255969) +++ soc2013/ccqin/head/sys/net80211/ieee80211_ratectl_none.c Thu Aug 15 10:18:36 2013 (r255970) @@ -57,7 +57,7 @@ } static void -none_node_init(struct ieee80211_node *ni) +none_node_init(struct ieee80211_node *ni, uint32_t capabilities) { ni->ni_txrate = ni->ni_rates.rs_rates[0] & IEEE80211_RATE_VAL; }