---

yaml
---
r: 198615
b: refs/heads/master
c: 4e8998f
h: refs/heads/master
i:
  198613: cb39885
  198611: b1f9edc
  198607: aa984da
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96900c751dd16fc9455e7184cbe8758ac7aa7e79
+refs/heads/master: 4e8998f09bd777f99ea3dae6f87f2c367979e6c0

trunk/include/net/mac80211.h

@@ -815,6 +815,7 @@ enum ieee80211_key_flags {
  *	encrypted in hardware.
  * @alg: The key algorithm.
  * @flags: key flags, see &enum ieee80211_key_flags.
+ * @ap_addr: AP's MAC address
  * @keyidx: the key index (0-3)
  * @keylen: key material length
  * @key: key material. For ALG_TKIP the key is encoded as a 256-bit (32 byte)
@@ -1637,6 +1638,8 @@ enum ieee80211_ampdu_mlme_action {
  *	Returns a negative error code on failure.
  *	The callback must be atomic.
  *
+ * @get_survey: Return per-channel survey information
+ *
  * @rfkill_poll: Poll rfkill hardware state. If you need this, you also
  *	need to set wiphy->rfkill_poll to %true before registration,
  *	and need to call wiphy_rfkill_set_hw_state() in the callback.