TDLS: Add channel-switch capability flag

[mech_eap.git] / src / rsn_supp / wpa_i.h

diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
index 0e0d373..ad4ccae 100644 (file)
--- a/src/rsn_supp/wpa_i.h
+++ b/src/rsn_supp/wpa_i.h
@@ -58,6 +58,7 @@ struct wpa_sm {
        u8 ssid[32];
        size_t ssid_len;
        int wpa_ptk_rekey;
+       int p2p;
 
        u8 own_addr[ETH_ALEN];
        const char *ifname;
@@ -101,6 +102,9 @@ struct wpa_sm {
         * to it via tdls_mgmt.
         */
        int tdls_external_setup;
+
+       /* The driver supports TDLS channel switching */
+       int tdls_chan_switch;
 #endif /* CONFIG_TDLS */
 
 #ifdef CONFIG_IEEE80211R
@@ -122,6 +126,10 @@ struct wpa_sm {
        u8 *assoc_resp_ies; /* MDIE and FTIE from (Re)Association Response */
        size_t assoc_resp_ies_len;
 #endif /* CONFIG_IEEE80211R */
+
+#ifdef CONFIG_P2P
+       u8 p2p_ip_addr[3 * 4];
+#endif /* CONFIG_P2P */
 };
 
 
@@ -252,23 +260,26 @@ static inline void wpa_sm_set_rekey_offload(struct wpa_sm *sm)
 #ifdef CONFIG_TDLS
 static inline int wpa_sm_tdls_get_capa(struct wpa_sm *sm,
                                       int *tdls_supported,
-                                      int *tdls_ext_setup)
+                                      int *tdls_ext_setup,
+                                      int *tdls_chan_switch)
 {
        if (sm->ctx->tdls_get_capa)
                return sm->ctx->tdls_get_capa(sm->ctx->ctx, tdls_supported,
-                                             tdls_ext_setup);
+                                             tdls_ext_setup, tdls_chan_switch);
        return -1;
 }
 
 static inline int wpa_sm_send_tdls_mgmt(struct wpa_sm *sm, const u8 *dst,
                                        u8 action_code, u8 dialog_token,
-                                       u16 status_code, const u8 *buf,
+                                       u16 status_code, u32 peer_capab,
+                                       int initiator, const u8 *buf,
                                        size_t len)
 {
        if (sm->ctx->send_tdls_mgmt)
                return sm->ctx->send_tdls_mgmt(sm->ctx->ctx, dst, action_code,
                                               dialog_token, status_code,
-                                              buf, len);
+                                              peer_capab, initiator, buf,
+                                              len);
        return -1;
 }
 
@@ -286,18 +297,35 @@ wpa_sm_tdls_peer_addset(struct wpa_sm *sm, const u8 *addr, int add,
                        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, size_t ext_capab_len)
+                       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,
+                       size_t supp_oper_classes_len)
 {
        if (sm->ctx->tdls_peer_addset)
                return sm->ctx->tdls_peer_addset(sm->ctx->ctx, addr, add,
                                                 aid, capability, supp_rates,
                                                 supp_rates_len, ht_capab,
-                                                vht_capab, qosinfo,
-                                                ext_capab, ext_capab_len);
+                                                vht_capab, qosinfo, wmm,
+                                                ext_capab, ext_capab_len,
+                                                supp_channels,
+                                                supp_channels_len,
+                                                supp_oper_classes,
+                                                supp_oper_classes_len);
        return -1;
 }
 #endif /* CONFIG_TDLS */
 
+static inline int wpa_sm_key_mgmt_set_pmk(struct wpa_sm *sm,
+                                         const u8 *pmk, size_t pmk_len)
+{
+       if (!sm->proactive_key_caching)
+               return 0;
+       if (!sm->ctx->key_mgmt_set_pmk)
+               return -1;
+       return sm->ctx->key_mgmt_set_pmk(sm->ctx->ctx, pmk, pmk_len);
+}
+
 void wpa_eapol_key_send(struct wpa_sm *sm, const u8 *kck,
                        int ver, const u8 *dest, u16 proto,
                        u8 *msg, size_t msg_len, u8 *key_mic);
@@ -309,7 +337,6 @@ int wpa_supplicant_send_2_of_4(struct wpa_sm *sm, const unsigned char *dst,
 int wpa_supplicant_send_4_of_4(struct wpa_sm *sm, const unsigned char *dst,
                               const struct wpa_eapol_key *key,
                               u16 ver, u16 key_info,
-                              const u8 *kde, size_t kde_len,
                               struct wpa_ptk *ptk);
 
 int wpa_derive_ptk_ft(struct wpa_sm *sm, const unsigned char *src_addr,