PERFORCE change 137800 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=137800

Change 137800 by sam at sam_ebb on 2008/03/15 20:58:04

	o don't attach 11n sysctl knobs for legacy devices
	o reorder some knobs to get most interesting bits near the top

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#23 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#23 (text+ko) ====

@@ -192,12 +192,18 @@
 	SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
 		"%parent", CTLFLAG_RD, vap->iv_ic, 0,
 		ieee80211_sysctl_parent, "A", "parent device");
+	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
+		"driver_caps", CTLFLAG_RW, &vap->iv_caps, 0,
+		"driver capabilities");
 #ifdef IEEE80211_DEBUG
 	vap->iv_debug = ieee80211_debug;
 	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
 		"debug", CTLFLAG_RW, &vap->iv_debug, 0,
 		"control debugging printfs");
 #endif
+	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
+		"bmiss_max", CTLFLAG_RW, &vap->iv_bmiss_max, 0,
+		"consecutive beacon misses before scanning");
 	/* XXX inherit from tunables */
 	SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
 		"inact_run", CTLTYPE_INT | CTLFLAG_RW, &vap->iv_inact_run, 0,
@@ -215,28 +221,24 @@
 		"inact_init", CTLTYPE_INT | CTLFLAG_RW, &vap->iv_inact_init, 0,
 		ieee80211_sysctl_inact, "I",
 		"station initial state timeout (sec)");
-	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
-		"driver_caps", CTLFLAG_RW, &vap->iv_caps, 0,
-		"driver capabilities");
-	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
-		"bmiss_max", CTLFLAG_RW, &vap->iv_bmiss_max, 0,
-		"consecutive beacon misses before scanning");
-	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
-		"ampdu_mintraffic_bk", CTLFLAG_RW,
-		&vap->iv_ampdu_mintraffic[WME_AC_BK], 0,
-		"BK traffic tx aggr threshold (pps)");
-	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
-		"ampdu_mintraffic_be", CTLFLAG_RW,
-		&vap->iv_ampdu_mintraffic[WME_AC_BE], 0,
-		"BE traffic tx aggr threshold (pps)");
-	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
-		"ampdu_mintraffic_vo", CTLFLAG_RW,
-		&vap->iv_ampdu_mintraffic[WME_AC_VO], 0,
-		"VO traffic tx aggr threshold (pps)");
-	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
-		"ampdu_mintraffic_vi", CTLFLAG_RW,
-		&vap->iv_ampdu_mintraffic[WME_AC_VI], 0,
-		"VI traffic tx aggr threshold (pps)");
+	if (vap->iv_htcaps & IEEE80211_HTC_HT) {
+		SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
+			"ampdu_mintraffic_bk", CTLFLAG_RW,
+			&vap->iv_ampdu_mintraffic[WME_AC_BK], 0,
+			"BK traffic tx aggr threshold (pps)");
+		SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
+			"ampdu_mintraffic_be", CTLFLAG_RW,
+			&vap->iv_ampdu_mintraffic[WME_AC_BE], 0,
+			"BE traffic tx aggr threshold (pps)");
+		SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
+			"ampdu_mintraffic_vo", CTLFLAG_RW,
+			&vap->iv_ampdu_mintraffic[WME_AC_VO], 0,
+			"VO traffic tx aggr threshold (pps)");
+		SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
+			"ampdu_mintraffic_vi", CTLFLAG_RW,
+			&vap->iv_ampdu_mintraffic[WME_AC_VI], 0,
+			"VI traffic tx aggr threshold (pps)");
+	}
 	vap->iv_sysctl = ctx;
 	vap->iv_oid = oid;
 }