diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-02-27 16:08:00 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-03-01 13:48:21 -0500 |
commit | c8dcfd8a046c1f49af0c15726761af17b957962d (patch) | |
tree | f021e2f1b9587c1f9b6c871c75881e81422ad280 /include | |
parent | e7a2a4f5e61ccfae03185384e06b852dbb1e3630 (diff) |
cfg80211: add a field for the bitrate of the last rx data packet from a station
Also fix a typo in the STATION_INFO_TX_BITRATE description
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/nl80211.h | 3 | ||||
-rw-r--r-- | include/net/cfg80211.h | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h index 821ffb954f14..30022189104d 100644 --- a/include/linux/nl80211.h +++ b/include/linux/nl80211.h | |||
@@ -1243,6 +1243,8 @@ enum nl80211_rate_info { | |||
1243 | * @NL80211_STA_INFO_LLID: the station's mesh LLID | 1243 | * @NL80211_STA_INFO_LLID: the station's mesh LLID |
1244 | * @NL80211_STA_INFO_PLID: the station's mesh PLID | 1244 | * @NL80211_STA_INFO_PLID: the station's mesh PLID |
1245 | * @NL80211_STA_INFO_PLINK_STATE: peer link state for the station | 1245 | * @NL80211_STA_INFO_PLINK_STATE: peer link state for the station |
1246 | * @NL80211_STA_INFO_RX_BITRATE: last unicast data frame rx rate, nested | ||
1247 | * attribute, like NL80211_STA_INFO_TX_BITRATE. | ||
1246 | * @__NL80211_STA_INFO_AFTER_LAST: internal | 1248 | * @__NL80211_STA_INFO_AFTER_LAST: internal |
1247 | * @NL80211_STA_INFO_MAX: highest possible station info attribute | 1249 | * @NL80211_STA_INFO_MAX: highest possible station info attribute |
1248 | */ | 1250 | */ |
@@ -1261,6 +1263,7 @@ enum nl80211_sta_info { | |||
1261 | NL80211_STA_INFO_TX_RETRIES, | 1263 | NL80211_STA_INFO_TX_RETRIES, |
1262 | NL80211_STA_INFO_TX_FAILED, | 1264 | NL80211_STA_INFO_TX_FAILED, |
1263 | NL80211_STA_INFO_SIGNAL_AVG, | 1265 | NL80211_STA_INFO_SIGNAL_AVG, |
1266 | NL80211_STA_INFO_RX_BITRATE, | ||
1264 | 1267 | ||
1265 | /* keep last */ | 1268 | /* keep last */ |
1266 | __NL80211_STA_INFO_AFTER_LAST, | 1269 | __NL80211_STA_INFO_AFTER_LAST, |
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 679a0494b5f2..1ac5786da14b 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
@@ -413,7 +413,7 @@ struct station_parameters { | |||
413 | * @STATION_INFO_PLID: @plid filled | 413 | * @STATION_INFO_PLID: @plid filled |
414 | * @STATION_INFO_PLINK_STATE: @plink_state filled | 414 | * @STATION_INFO_PLINK_STATE: @plink_state filled |
415 | * @STATION_INFO_SIGNAL: @signal filled | 415 | * @STATION_INFO_SIGNAL: @signal filled |
416 | * @STATION_INFO_TX_BITRATE: @tx_bitrate fields are filled | 416 | * @STATION_INFO_TX_BITRATE: @txrate fields are filled |
417 | * (tx_bitrate, tx_bitrate_flags and tx_bitrate_mcs) | 417 | * (tx_bitrate, tx_bitrate_flags and tx_bitrate_mcs) |
418 | * @STATION_INFO_RX_PACKETS: @rx_packets filled | 418 | * @STATION_INFO_RX_PACKETS: @rx_packets filled |
419 | * @STATION_INFO_TX_PACKETS: @tx_packets filled | 419 | * @STATION_INFO_TX_PACKETS: @tx_packets filled |
@@ -421,6 +421,7 @@ struct station_parameters { | |||
421 | * @STATION_INFO_TX_FAILED: @tx_failed filled | 421 | * @STATION_INFO_TX_FAILED: @tx_failed filled |
422 | * @STATION_INFO_RX_DROP_MISC: @rx_dropped_misc filled | 422 | * @STATION_INFO_RX_DROP_MISC: @rx_dropped_misc filled |
423 | * @STATION_INFO_SIGNAL_AVG: @signal_avg filled | 423 | * @STATION_INFO_SIGNAL_AVG: @signal_avg filled |
424 | * @STATION_INFO_RX_BITRATE: @rxrate fields are filled | ||
424 | */ | 425 | */ |
425 | enum station_info_flags { | 426 | enum station_info_flags { |
426 | STATION_INFO_INACTIVE_TIME = 1<<0, | 427 | STATION_INFO_INACTIVE_TIME = 1<<0, |
@@ -437,6 +438,7 @@ enum station_info_flags { | |||
437 | STATION_INFO_TX_FAILED = 1<<11, | 438 | STATION_INFO_TX_FAILED = 1<<11, |
438 | STATION_INFO_RX_DROP_MISC = 1<<12, | 439 | STATION_INFO_RX_DROP_MISC = 1<<12, |
439 | STATION_INFO_SIGNAL_AVG = 1<<13, | 440 | STATION_INFO_SIGNAL_AVG = 1<<13, |
441 | STATION_INFO_RX_BITRATE = 1<<14, | ||
440 | }; | 442 | }; |
441 | 443 | ||
442 | /** | 444 | /** |
@@ -506,6 +508,7 @@ struct station_info { | |||
506 | s8 signal; | 508 | s8 signal; |
507 | s8 signal_avg; | 509 | s8 signal_avg; |
508 | struct rate_info txrate; | 510 | struct rate_info txrate; |
511 | struct rate_info rxrate; | ||
509 | u32 rx_packets; | 512 | u32 rx_packets; |
510 | u32 tx_packets; | 513 | u32 tx_packets; |
511 | u32 tx_retries; | 514 | u32 tx_retries; |