svn commit: r302307 - head/sys/net80211

[Adrian Chadd]

Author: adrian
Date: Fri Jul  1 19:58:13 2016
New Revision: 302307
URL: https://svnweb.freebsd.org/changeset/base/302307

Log:
  [net80211] teach AMRR to log the initial MCS rate as "MCS X"
  
  Otheriwse it logs it as the rate value, which is 0x80 (MCS flag) + MCS,
  which isn't that helpful.
  
  Approved by:	re (gjb)

Modified:
  head/sys/net80211/ieee80211_amrr.c

Modified: head/sys/net80211/ieee80211_amrr.c
==============================================================================
--- head/sys/net80211/ieee80211_amrr.c	Fri Jul  1 07:27:33 2016	(r302306)
+++ head/sys/net80211/ieee80211_amrr.c	Fri Jul  1 19:58:13 2016	(r302307)
@@ -220,10 +220,13 @@ amrr_node_init(struct ieee80211_node *ni
 	ni->ni_txrate = rate;
 	amn->amn_ticks = ticks;
 
+	/* XXX TODO: we really need a rate-to-string method */
+	/* XXX TODO: non-11n rate should be divided by two.. */
 	IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_RATECTL, ni,
-	    "AMRR: nrates=%d, initial rate %d",
+	    "AMRR: nrates=%d, initial rate %s%d",
 	    rs->rs_nrates,
-	    rate);
+	    amrr_node_is_11n(ni) ? "MCS " : "",
+	    rate & IEEE80211_RATE_VAL);
 }
 
 static void
@@ -249,6 +252,8 @@ amrr_update(struct ieee80211_amrr *amrr,
 		rs = &ni->ni_rates;
 	}
 
+	/* XXX TODO: we really need a rate-to-string method */
+	/* XXX TODO: non-11n rate should be divided by two.. */
 	IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_RATECTL, ni,
 	    "AMRR: current rate %d, txcnt=%d, retrycnt=%d",
 	    rs->rs_rates[rix] & IEEE80211_RATE_VAL,
@@ -270,6 +275,8 @@ amrr_update(struct ieee80211_amrr *amrr,
 			amn->amn_recovery = 1;
 			amn->amn_success = 0;
 			rix++;
+			/* XXX TODO: we really need a rate-to-string method */
+			/* XXX TODO: non-11n rate should be divided by two.. */
 			IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_RATECTL, ni,
 			    "AMRR increasing rate %d (txcnt=%d retrycnt=%d)",
 			    rs->rs_rates[rix] & IEEE80211_RATE_VAL,
@@ -291,6 +298,8 @@ amrr_update(struct ieee80211_amrr *amrr,
 				    amrr->amrr_min_success_threshold;
 			}
 			rix--;
+			/* XXX TODO: we really need a rate-to-string method */
+			/* XXX TODO: non-11n rate should be divided by two.. */
 			IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_RATECTL, ni,
 			    "AMRR decreasing rate %d (txcnt=%d retrycnt=%d)",
 			    rs->rs_rates[rix] & IEEE80211_RATE_VAL,