Date: Fri, 13 Feb 2009 05:49:42 +0000 (UTC) From: Sam Leffler <sam@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org 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... Message-ID: <200902130549.n1D5ngu4077985@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902130549.n1D5ngu4077985>