From b43eeeefaedef8ea6546d89a4166e648a794fa98 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Fri, 18 Mar 2011 09:33:02 -0700
Subject: [PATCH] --- yaml --- r: 242619 b: refs/heads/master c:
 858022aa6fad90ec86c567cbf54682a61dd39a01 h: refs/heads/master i:   242617:
 da1c2bbffb71202e6eb769693d7ef689ae166119   242615:
 f540eb40a6904597fe3bdafbb70f962ce142a317 v: v3

---
 [refs]                       | 2 +-
 trunk/include/net/cfg80211.h | 3 ++-
 trunk/include/net/mac80211.h | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 848a0dcd2385..d220cc58da76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e9d592f02f657361168c94e22d9602cad71a09c
+refs/heads/master: 858022aa6fad90ec86c567cbf54682a61dd39a01
diff --git a/trunk/include/net/cfg80211.h b/trunk/include/net/cfg80211.h
index 60f7876b6da8..b2b9d28cb4ab 100644
--- a/trunk/include/net/cfg80211.h
+++ b/trunk/include/net/cfg80211.h
@@ -486,7 +486,8 @@ struct rate_info {
  * @plink_state: mesh peer link state
  * @signal: signal strength of last received packet in dBm
  * @signal_avg: signal strength average in dBm
- * @txrate: current unicast bitrate to this station
+ * @txrate: current unicast bitrate from this station
+ * @rxrate: current unicast bitrate to this station
  * @rx_packets: packets received from this station
  * @tx_packets: packets transmitted to this station
  * @tx_retries: cumulative retry counts
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
index 8650e7bf2ed0..cefe1b37c493 100644
--- a/trunk/include/net/mac80211.h
+++ b/trunk/include/net/mac80211.h
@@ -1160,7 +1160,7 @@ enum ieee80211_hw_flags {
  * @napi_weight: weight used for NAPI polling.  You must specify an
  *	appropriate value here if a napi_poll operation is provided
  *	by your driver.
-
+ *
  * @max_rx_aggregation_subframes: maximum buffer size (number of
  *	sub-frames) to be used for A-MPDU block ack receiver
  *	aggregation.