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 845a1b6..ad4ccae 100644 (file)
--- a/src/rsn_supp/wpa_i.h
+++ b/src/rsn_supp/wpa_i.h
@@ -102,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
@@ -257,11 +260,12 @@ 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;
 }
 
@@ -293,16 +297,16 @@ 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,
-                       const u8 *supp_channels, size_t supp_channels_len,
-                       const u8 *supp_oper_classes,
+                       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,
+                                                vht_capab, qosinfo, wmm,
                                                 ext_capab, ext_capab_len,
                                                 supp_channels,
                                                 supp_channels_len,
@@ -312,6 +316,16 @@ wpa_sm_tdls_peer_addset(struct wpa_sm *sm, const u8 *addr, int add,
 }
 #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);