diff options
| author | Sudhir Sharma <sudhshar@codeaurora.org> | 2015-03-11 14:49:35 -0700 |
|---|---|---|
| committer | Sudhir Sharma <sudhshar@codeaurora.org> | 2015-03-11 14:50:07 -0700 |
| commit | 72496cfdb23ceea248638c4dc660cf69e6ba670e (patch) | |
| tree | 912487ae2887ac2f9acd66be284a4157a5b3c6c4 /src/rsn_supp/wpa.h | |
| parent | c864c68989f4a594220e0cede848dd49ee5af46b (diff) | |
| parent | 8ad28599aadb8960cfdb4f4a7c2fdd619fbb2d24 (diff) | |
| download | android_external_wpa_supplicant_8-72496cfdb23ceea248638c4dc660cf69e6ba670e.tar.gz android_external_wpa_supplicant_8-72496cfdb23ceea248638c4dc660cf69e6ba670e.tar.bz2 android_external_wpa_supplicant_8-72496cfdb23ceea248638c4dc660cf69e6ba670e.zip | |
Merge tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.00.02.081.002' into HEAD
"AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.00.02.081.002"
Conflicts:
src/utils/http_curl.c
Change-Id: I31aaf07069a70607c3d0486f505dc89f4062225b
Diffstat (limited to 'src/rsn_supp/wpa.h')
| -rw-r--r-- | src/rsn_supp/wpa.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rsn_supp/wpa.h b/src/rsn_supp/wpa.h index 413b46e6..0b5b97de 100644 --- a/src/rsn_supp/wpa.h +++ b/src/rsn_supp/wpa.h @@ -55,14 +55,14 @@ struct wpa_sm_ctx { int (*send_tdls_mgmt)(void *ctx, const u8 *dst, u8 action_code, u8 dialog_token, u16 status_code, u32 peer_capab, - const u8 *buf, size_t len); + int initiator, const u8 *buf, size_t len); int (*tdls_oper)(void *ctx, int oper, const u8 *peer); int (*tdls_peer_addset)(void *ctx, const u8 *addr, int add, u16 aid, u16 capability, const u8 *supp_rates, size_t supp_rates_len, const struct ieee80211_ht_capabilities *ht_capab, const struct ieee80211_vht_capabilities *vht_capab, - u8 qosinfo, const u8 *ext_capab, + u8 qosinfo, int wmm, const u8 *ext_capab, size_t ext_capab_len, const u8 *supp_channels, size_t supp_channels_len, const u8 *supp_oper_classes, |