Date: Mon, 29 Aug 2011 13:01:23 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r225245 - in user/adrian/if_ath_tx/sys: conf net80211 Message-ID: <201108291301.p7TD1NG3097720@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Mon Aug 29 13:01:23 2011 New Revision: 225245 URL: http://svn.freebsd.org/changeset/base/225245 Log: Make net80211 aggressive more configurable. Modified: user/adrian/if_ath_tx/sys/conf/options user/adrian/if_ath_tx/sys/net80211/ieee80211_output.c user/adrian/if_ath_tx/sys/net80211/ieee80211_proto.c Modified: user/adrian/if_ath_tx/sys/conf/options ============================================================================== --- user/adrian/if_ath_tx/sys/conf/options Mon Aug 29 10:29:05 2011 (r225244) +++ user/adrian/if_ath_tx/sys/conf/options Mon Aug 29 13:01:23 2011 (r225245) @@ -841,6 +841,7 @@ IEEE80211_SUPPORT_MESH opt_wlan.h IEEE80211_SUPPORT_SUPERG opt_wlan.h IEEE80211_SUPPORT_TDMA opt_wlan.h IEEE80211_ALQ opt_wlan.h +IEEE80211_SUPPORT_AGGRMODE opt_wlan.h # 802.11 TDMA support TDMA_SLOTLEN_DEFAULT opt_tdma.h Modified: user/adrian/if_ath_tx/sys/net80211/ieee80211_output.c ============================================================================== --- user/adrian/if_ath_tx/sys/net80211/ieee80211_output.c Mon Aug 29 10:29:05 2011 (r225244) +++ user/adrian/if_ath_tx/sys/net80211/ieee80211_output.c Mon Aug 29 13:01:23 2011 (r225245) @@ -2830,6 +2830,7 @@ ieee80211_beacon_update(struct ieee80211 if (vap->iv_flags & IEEE80211_F_WME) { struct ieee80211_wme_state *wme = &ic->ic_wme; +#ifdef IEEE80211_SUPPORT_AGGRMODE /* * Check for agressive mode change. When there is * significant high priority traffic in the BSS @@ -2862,6 +2863,8 @@ ieee80211_beacon_update(struct ieee80211 wme->wme_hipri_traffic = wme->wme_hipri_switch_hysteresis; } +#endif /* IEEE80211_SUPPORT_AGGRMODE */ + if (isset(bo->bo_flags, IEEE80211_BEACON_WME)) { (void) ieee80211_add_wme_param(bo->bo_wme, wme); clrbit(bo->bo_flags, IEEE80211_BEACON_WME); Modified: user/adrian/if_ath_tx/sys/net80211/ieee80211_proto.c ============================================================================== --- user/adrian/if_ath_tx/sys/net80211/ieee80211_proto.c Mon Aug 29 10:29:05 2011 (r225244) +++ user/adrian/if_ath_tx/sys/net80211/ieee80211_proto.c Mon Aug 29 13:01:23 2011 (r225245) @@ -974,6 +974,7 @@ ieee80211_wme_initparams(struct ieee8021 void ieee80211_wme_updateparams_locked(struct ieee80211vap *vap) { +#ifdef IEEE80211_SUPPORT_AGGRMODE static const paramType aggrParam[IEEE80211_MODE_MAX] = { [IEEE80211_MODE_AUTO] = { 2, 4, 10, 64, 0 }, [IEEE80211_MODE_11A] = { 2, 4, 10, 64, 0 }, @@ -988,10 +989,14 @@ ieee80211_wme_updateparams_locked(struct [IEEE80211_MODE_11NA] = { 2, 4, 10, 64, 0 }, /* XXXcheck*/ [IEEE80211_MODE_11NG] = { 2, 4, 10, 64, 0 }, /* XXXcheck*/ }; + struct wmeParams *bssp; + +#endif /* IEEE80211_SUPPORT_AGGRMODE */ + struct ieee80211com *ic = vap->iv_ic; struct ieee80211_wme_state *wme = &ic->ic_wme; const struct wmeParams *wmep; - struct wmeParams *chanp, *bssp; + struct wmeParams *chanp; enum ieee80211_phymode mode; int i; @@ -1026,6 +1031,7 @@ ieee80211_wme_updateparams_locked(struct else mode = IEEE80211_MODE_AUTO; +#ifdef IEEE80211_SUPPORT_AGGRMODE /* * This implements agressive mode as found in certain * vendors' AP's. When there is significant high @@ -1081,6 +1087,8 @@ ieee80211_wme_updateparams_locked(struct "update %s (chan+bss) logcwmin %u\n", ieee80211_wme_acnames[WME_AC_BE], chanp->wmep_logcwmin); } +#endif /* IEEE80211_SUPPORT_AGGRMODE */ + if (vap->iv_opmode == IEEE80211_M_HOSTAP) { /* XXX ibss? */ /* * Arrange for a beacon update and bump the parameter
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108291301.p7TD1NG3097720>