From owner-svn-soc-all@FreeBSD.ORG Mon Sep 2 08:00:12 2013 Return-Path: Delivered-To: svn-soc-all@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 9FACE367 for ; Mon, 2 Sep 2013 08:00:12 +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 8B7362588 for ; Mon, 2 Sep 2013 08:00:12 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8280CRv004938 for ; Mon, 2 Sep 2013 08:00:12 GMT (envelope-from ccqin@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r8280Cm7004921 for svn-soc-all@FreeBSD.org; Mon, 2 Sep 2013 08:00:12 GMT (envelope-from ccqin@FreeBSD.org) Date: Mon, 2 Sep 2013 08:00:12 GMT Message-Id: <201309020800.r8280Cm7004921@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: r256825 - 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: Mon, 02 Sep 2013 08:00:12 -0000 Author: ccqin Date: Mon Sep 2 08:00:12 2013 New Revision: 256825 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=256825 Log: minor errors in ieee80211_amrr fixed. Modified: soc2013/ccqin/head/sys/net80211/ieee80211_amrr.c Modified: soc2013/ccqin/head/sys/net80211/ieee80211_amrr.c ============================================================================== --- soc2013/ccqin/head/sys/net80211/ieee80211_amrr.c Mon Sep 2 07:43:31 2013 (r256824) +++ soc2013/ccqin/head/sys/net80211/ieee80211_amrr.c Mon Sep 2 08:00:12 2013 (r256825) @@ -65,7 +65,7 @@ static int amrr_update(struct ieee80211_amrr *, struct ieee80211_amrr_node *, struct ieee80211_node *); static int amrr_rate(struct ieee80211_node *, void *, uint32_t); -static int amrr_rates(struct ieee80211_node *, struct ieee80211_rc_info *); +static void amrr_rates(struct ieee80211_node *, struct ieee80211_rc_info *); static void amrr_tx_complete(const struct ieee80211vap *, const struct ieee80211_node *, struct ieee80211_rc_info *); static void amrr_tx_update(const struct ieee80211vap *vap, @@ -382,8 +382,8 @@ ieee80211_ratectl_update_stat(vap, rc_info); amn->amn_txcnt += rc_info->iri_txcnt; - amn->amn_success += (rc_info->iri_txcnt - rc_info->failcnt); - amn->amn_retrycnt += rc_info->retrycnt; + amn->amn_success += (rc_info->iri_txcnt - rc_info->iri_failcnt); + amn->amn_retrycnt += rc_info->iri_retrycnt; } /*