---

yaml
---
r: 251647
b: refs/heads/master
c: 1ba0145
h: refs/heads/master
i:
  251645: 1f839f9
  251643: 5e7fe12
  251639: 0ac1f9e
  251631: fb7e5ce
  251615: 2b8a7cc
  251583: 2880cf2
  251519: 0e3cd9f
  251391: 8f1d36c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54a430c0a4991951805df92efb8c42bdb1277ffd
+refs/heads/master: 1ba0145884de7993c5d4f02d629eb18c17527e6e

trunk/include/net/cfg80211.h

@@ -531,6 +531,7 @@ struct sta_bss_parameters {
  * @tx_retries: cumulative retry counts
  * @tx_failed: number of failed transmissions (retries exceeded, no ACK)
  * @rx_dropped_misc:  Dropped for un-specified reason.
+ * @bss_param: current BSS parameters
  * @generation: generation number for nl80211 dumps.
  *	This number should increase every time the list of stations
  *	changes, i.e. when a station is added or removed, so that
@@ -1537,7 +1538,7 @@ struct cfg80211_ops {
  * @WIPHY_FLAG_IBSS_RSN: The device supports IBSS RSN.
  * @WIPHY_FLAG_MESH_AUTH: The device supports mesh authentication by routing
  *	auth frames to userspace. See @NL80211_MESH_SETUP_USERSPACE_AUTH.
- * @WIPHY_FLAG_SCHED_SCAN: The device supports scheduled scans.
+ * @WIPHY_FLAG_SUPPORTS_SCHED_SCAN: The device supports scheduled scans.
  */
 enum wiphy_flags {
 	WIPHY_FLAG_CUSTOM_REGULATORY		= BIT(0),