History

cfg80211: clarify LCI/civic location documentation

The older code and current userspace assumed that this data is the content of the Measurement Report element, starting with the Measurement Token. Clarify this in the documentation.

Johannes Berg committed 7 years ago

Commit 30db6411 parent 554be832 files · +16 −6Browse files

Unified · Split

2 files
  1. include/net/cfg80211.h +4 −2
  2. include/uapi/linux/nl80211.h +12 −4
include/net/cfg80211.h+4−2
@@ -777,8 +777,10 @@ struct cfg80211_crypto_settings { · 776 unmodified lines
777 * @probe_resp: probe response template (AP mode only)777 * @probe_resp: probe response template (AP mode only)
778 * @ftm_responder: enable FTM responder functionality; -1 for no change778 * @ftm_responder: enable FTM responder functionality; -1 for no change
779 * (which also implies no change in LCI/civic location data)779 * (which also implies no change in LCI/civic location data)
780 * @lci: LCI subelement content780 * @lci: Measurement Report element content, starting with Measurement Token
781 * @civicloc: Civic location subelement content781 * (measurement type 8)
782 * @civicloc: Measurement Report element content, starting with Measurement
783 * Token (measurement type 11)
782 * @lci_len: LCI data length784 * @lci_len: LCI data length
783 * @civicloc_len: Civic location data length785 * @civicloc_len: Civic location data length
784 */786 */
include/uapi/linux/nl80211.h+12−4
@@ -5893,9 +5893,11 @@ enum nl80211_external_auth_action { · 5892 unmodified lines
5893 * @__NL80211_FTM_RESP_ATTR_INVALID: Invalid5893 * @__NL80211_FTM_RESP_ATTR_INVALID: Invalid
5894 * @NL80211_FTM_RESP_ATTR_ENABLED: FTM responder is enabled5894 * @NL80211_FTM_RESP_ATTR_ENABLED: FTM responder is enabled
5895 * @NL80211_FTM_RESP_ATTR_LCI: The content of Measurement Report Element5895 * @NL80211_FTM_RESP_ATTR_LCI: The content of Measurement Report Element
5896 * (9.4.2.22 in 802.11-2016) with type 8 - LCI (9.4.2.22.10)5896 * (9.4.2.22 in 802.11-2016) with type 8 - LCI (9.4.2.22.10),
5897 * i.e. starting with the measurement token
5897 * @NL80211_FTM_RESP_ATTR_CIVIC: The content of Measurement Report Element5898 * @NL80211_FTM_RESP_ATTR_CIVIC: The content of Measurement Report Element
5898 * (9.4.2.22 in 802.11-2016) with type 11 - Civic (Section 9.4.2.22.13)5899 * (9.4.2.22 in 802.11-2016) with type 11 - Civic (Section 9.4.2.22.13),
5900 * i.e. starting with the measurement token
5899 * @__NL80211_FTM_RESP_ATTR_LAST: Internal5901 * @__NL80211_FTM_RESP_ATTR_LAST: Internal
5900 * @NL80211_FTM_RESP_ATTR_MAX: highest FTM responder attribute.5902 * @NL80211_FTM_RESP_ATTR_MAX: highest FTM responder attribute.
5901 */5903 */
@@ -6295,9 +6297,15 @@ enum nl80211_peer_measurement_ftm_failure_reasons { · 393 unmodified lines
6295 * @NL80211_PMSR_FTM_RESP_ATTR_DIST_VARIANCE: distance variance (u64, mm^2, note6297 * @NL80211_PMSR_FTM_RESP_ATTR_DIST_VARIANCE: distance variance (u64, mm^2, note
6296 * that standard deviation is the square root of variance, optional)6298 * that standard deviation is the square root of variance, optional)
6297 * @NL80211_PMSR_FTM_RESP_ATTR_DIST_SPREAD: distance spread (u64, mm, optional)6299 * @NL80211_PMSR_FTM_RESP_ATTR_DIST_SPREAD: distance spread (u64, mm, optional)
6298 * @NL80211_PMSR_FTM_RESP_ATTR_LCI: LCI data from peer (binary, optional)6300 * @NL80211_PMSR_FTM_RESP_ATTR_LCI: LCI data from peer (binary, optional);
6301 * this is the contents of the Measurement Report Element (802.11-2016
6302 * 9.4.2.22.1) starting with the Measurement Token, with Measurement
6303 * Type 8.
6299 * @NL80211_PMSR_FTM_RESP_ATTR_CIVICLOC: civic location data from peer6304 * @NL80211_PMSR_FTM_RESP_ATTR_CIVICLOC: civic location data from peer
6300 * (binary, optional)6305 * (binary, optional);
6306 * this is the contents of the Measurement Report Element (802.11-2016
6307 * 9.4.2.22.1) starting with the Measurement Token, with Measurement
6308 * Type 11.
6301 * @NL80211_PMSR_FTM_RESP_ATTR_PAD: ignore, for u64/s64 padding only6309 * @NL80211_PMSR_FTM_RESP_ATTR_PAD: ignore, for u64/s64 padding only
6302 *6310 *
6303 * @NUM_NL80211_PMSR_FTM_RESP_ATTR: internal6311 * @NUM_NL80211_PMSR_FTM_RESP_ATTR: internal