diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /include/net/cfg80211.h | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
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 |