summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-22 14:36:18 -0700
committerDavid S. Miller <davem@davemloft.net>2011-03-22 14:36:18 -0700
commitdb138908ccff404b9920f18f6244f4bff2368c04 (patch)
tree18734f9b833a5f1134fc138a00d9223fc2afa028 /include/net
parent04024b937a6e9b7d4320b5853557cea3930d528c (diff)
parent8bc8aecdc5e26cfda12dbd6867af4aa67836da6a (diff)
downloadlinux-db138908ccff404b9920f18f6244f4bff2368c04.tar.gz
linux-db138908ccff404b9920f18f6244f4bff2368c04.tar.bz2
linux-db138908ccff404b9920f18f6244f4bff2368c04.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include/net')
-rw-r--r--include/net/cfg80211.h3
-rw-r--r--include/net/mac80211.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 60f7876b6da8..b2b9d28cb4ab 100644
--- a/include/net/cfg80211.h
+++ b/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/include/net/mac80211.h b/include/net/mac80211.h
index 8650e7bf2ed0..cefe1b37c493 100644
--- a/include/net/mac80211.h
+++ b/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.