From owner-svn-src-projects@FreeBSD.ORG Fri Feb 13 05:49:43 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27785106566B; Fri, 13 Feb 2009 05:49:43 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0AFF18FC0A; Fri, 13 Feb 2009 05:49:43 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1D5ngMf077988; Fri, 13 Feb 2009 05:49:42 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1D5ngu4077985; Fri, 13 Feb 2009 05:49:42 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200902130549.n1D5ngu4077985@svn.freebsd.org> From: Sam Leffler Date: Fri, 13 Feb 2009 05:49:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188563 - in projects/vap7/sys: . contrib/pf dev dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5312 dev/ath/ath_hal/ar54... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Feb 2009 05:49:43 -0000 Author: sam Date: Fri Feb 13 05:49:42 2009 New Revision: 188563 URL: http://svn.freebsd.org/changeset/base/188563 Log: merge r188556: remove ic_stats Modified: projects/vap7/sys/ (props changed) projects/vap7/sys/contrib/pf/ (props changed) projects/vap7/sys/dev/ (props changed) projects/vap7/sys/dev/ath/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5210/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5211/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5212/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5312/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5416/ (props changed) projects/vap7/sys/dev/cxgb/ (props changed) projects/vap7/sys/dev/usb2/ (props changed) projects/vap7/sys/i386/conf/USB2 (props changed) projects/vap7/sys/modules/usb2/ (props changed) projects/vap7/sys/net80211/ (props changed) projects/vap7/sys/net80211/ieee80211.c projects/vap7/sys/net80211/ieee80211_ddb.c projects/vap7/sys/net80211/ieee80211_var.h Modified: projects/vap7/sys/net80211/ieee80211.c ============================================================================== --- projects/vap7/sys/net80211/ieee80211.c Fri Feb 13 05:49:03 2009 (r188562) +++ projects/vap7/sys/net80211/ieee80211.c Fri Feb 13 05:49:42 2009 (r188563) @@ -533,7 +533,6 @@ ieee80211_vap_detach(struct ieee80211vap */ ieee80211_stop_locked(vap); - /* XXX accumulate iv_stats in ic_stats? */ TAILQ_REMOVE(&ic->ic_vaps, vap, iv_next); ieee80211_syncflag_locked(ic, IEEE80211_F_WME); ieee80211_syncflag_locked(ic, IEEE80211_F_TURBOP); Modified: projects/vap7/sys/net80211/ieee80211_ddb.c ============================================================================== --- projects/vap7/sys/net80211/ieee80211_ddb.c Fri Feb 13 05:49:03 2009 (r188562) +++ projects/vap7/sys/net80211/ieee80211_ddb.c Fri Feb 13 05:49:42 2009 (r188563) @@ -432,7 +432,6 @@ _db_show_com(const struct ieee80211com * db_printf("\tifp %p", ic->ic_ifp); db_printf(" comlock %p", &ic->ic_comlock); db_printf("\n"); - _db_show_stats(&ic->ic_stats); db_printf("\theadroom %d", ic->ic_headroom); db_printf(" phytype %d", ic->ic_phytype); db_printf(" opmode %s", ieee80211_opmode_name[ic->ic_opmode]); Modified: projects/vap7/sys/net80211/ieee80211_var.h ============================================================================== --- projects/vap7/sys/net80211/ieee80211_var.h Fri Feb 13 05:49:03 2009 (r188562) +++ projects/vap7/sys/net80211/ieee80211_var.h Fri Feb 13 05:49:42 2009 (r188563) @@ -111,7 +111,6 @@ struct ieee80211com { struct ifnet *ic_ifp; /* associated device */ ieee80211_com_lock_t ic_comlock; /* state update lock */ TAILQ_HEAD(, ieee80211vap) ic_vaps; /* list of vap instances */ - struct ieee80211_stats ic_stats; /* statistics */ int ic_headroom; /* driver tx headroom needs */ enum ieee80211_phytype ic_phytype; /* XXX wrong for multi-mode */ enum ieee80211_opmode ic_opmode; /* operation mode */