diff options
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r-- | include/net/mac80211.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 5be900d19660..de22cbfef232 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -815,6 +815,7 @@ enum ieee80211_key_flags { | |||
815 | * encrypted in hardware. | 815 | * encrypted in hardware. |
816 | * @alg: The key algorithm. | 816 | * @alg: The key algorithm. |
817 | * @flags: key flags, see &enum ieee80211_key_flags. | 817 | * @flags: key flags, see &enum ieee80211_key_flags. |
818 | * @ap_addr: AP's MAC address | ||
818 | * @keyidx: the key index (0-3) | 819 | * @keyidx: the key index (0-3) |
819 | * @keylen: key material length | 820 | * @keylen: key material length |
820 | * @key: key material. For ALG_TKIP the key is encoded as a 256-bit (32 byte) | 821 | * @key: key material. For ALG_TKIP the key is encoded as a 256-bit (32 byte) |
@@ -831,7 +832,6 @@ struct ieee80211_key_conf { | |||
831 | u8 iv_len; | 832 | u8 iv_len; |
832 | u8 hw_key_idx; | 833 | u8 hw_key_idx; |
833 | u8 flags; | 834 | u8 flags; |
834 | u8 *ap_addr; | ||
835 | s8 keyidx; | 835 | s8 keyidx; |
836 | u8 keylen; | 836 | u8 keylen; |
837 | u8 key[0]; | 837 | u8 key[0]; |
@@ -1638,6 +1638,8 @@ enum ieee80211_ampdu_mlme_action { | |||
1638 | * Returns a negative error code on failure. | 1638 | * Returns a negative error code on failure. |
1639 | * The callback must be atomic. | 1639 | * The callback must be atomic. |
1640 | * | 1640 | * |
1641 | * @get_survey: Return per-channel survey information | ||
1642 | * | ||
1641 | * @rfkill_poll: Poll rfkill hardware state. If you need this, you also | 1643 | * @rfkill_poll: Poll rfkill hardware state. If you need this, you also |
1642 | * need to set wiphy->rfkill_poll to %true before registration, | 1644 | * need to set wiphy->rfkill_poll to %true before registration, |
1643 | * and need to call wiphy_rfkill_set_hw_state() in the callback. | 1645 | * and need to call wiphy_rfkill_set_hw_state() in the callback. |