diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-25 22:15:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-25 22:15:11 +0200 |
| commit | a261af927df64523925c98369106de15af9d7b5e (patch) | |
| tree | 3c8fb8be59b8a4733eb5b63ecf567976185c9f58 /include | |
| parent | sock.h: fix kernel-doc warning (diff) | |
| parent | ath9k: remove VEOL support for ad-hoc (diff) | |
| download | linux-a261af927df64523925c98369106de15af9d7b5e.tar.xz linux-a261af927df64523925c98369106de15af9d7b5e.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
| -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 { * 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) @@ -831,7 +832,6 @@ struct ieee80211_key_conf { u8 iv_len; u8 hw_key_idx; u8 flags; - u8 *ap_addr; s8 keyidx; u8 keylen; u8 key[0]; @@ -1638,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. |