diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /include/net/cfg80211.h | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include/net/cfg80211.h')
| -rw-r--r-- | include/net/cfg80211.h | 3 |
1 files changed, 2 insertions, 1 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 { | |||
| 486 | * @plink_state: mesh peer link state | 486 | * @plink_state: mesh peer link state |
| 487 | * @signal: signal strength of last received packet in dBm | 487 | * @signal: signal strength of last received packet in dBm |
| 488 | * @signal_avg: signal strength average in dBm | 488 | * @signal_avg: signal strength average in dBm |
| 489 | * @txrate: current unicast bitrate to this station | 489 | * @txrate: current unicast bitrate from this station |
| 490 | * @rxrate: current unicast bitrate to this station | ||
| 490 | * @rx_packets: packets received from this station | 491 | * @rx_packets: packets received from this station |
| 491 | * @tx_packets: packets transmitted to this station | 492 | * @tx_packets: packets transmitted to this station |
| 492 | * @tx_retries: cumulative retry counts | 493 | * @tx_retries: cumulative retry counts |