cfg80211: add and use strongly typed element iteration macros

[carl9170fw.git] / include / linux / ieee80211.h

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index dc71644f1ec59f12d0254f17bc25db43cc93009f..e71604bdb53b1e1ffe1a1c863db0e7dd85473684 100644 (file)
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -814,6 +814,8 @@ enum mesh_config_capab_flags {
        IEEE80211_MESHCONF_CAPAB_TBTT_ADJUSTING         = 0x20,
 };
 
+#define IEEE80211_MESHCONF_FORM_CONNECTED_TO_GATE 0x1
+
 /**
  * mesh channel switch parameters element's flag indicator
  *
@@ -1636,7 +1638,7 @@ struct ieee80211_he_mcs_nss_supp {
  * struct ieee80211_he_operation - HE capabilities element
  *
  * This structure is the "HE operation element" fields as
- * described in P802.11ax_D2.0 section 9.4.2.238
+ * described in P802.11ax_D3.0 section 9.4.2.238
  */
 struct ieee80211_he_operation {
        __le32 he_oper_params;
@@ -2028,17 +2030,17 @@ ieee80211_he_ppe_size(u8 ppe_thres_hdr, const u8 *phy_cap_info)
 }
 
 /* HE Operation defines */
-#define IEEE80211_HE_OPERATION_BSS_COLOR_MASK                  0x0000003f
-#define IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK           0x000001c0
-#define IEEE80211_HE_OPERATION_DFLT_PE_DURATION_OFFSET         6
-#define IEEE80211_HE_OPERATION_TWT_REQUIRED                    0x00000200
-#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK              0x000ffc00
-#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_OFFSET            10
-#define IEEE80211_HE_OPERATION_PARTIAL_BSS_COLOR               0x00100000
-#define IEEE80211_HE_OPERATION_VHT_OPER_INFO                   0x00200000
-#define IEEE80211_HE_OPERATION_MULTI_BSSID_AP                  0x10000000
-#define IEEE80211_HE_OPERATION_TX_BSSID_INDICATOR              0x20000000
-#define IEEE80211_HE_OPERATION_BSS_COLOR_DISABLED              0x40000000
+#define IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK           0x00000003
+#define IEEE80211_HE_OPERATION_TWT_REQUIRED                    0x00000008
+#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK              0x00003ff0
+#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_OFFSET            4
+#define IEEE80211_HE_OPERATION_VHT_OPER_INFO                   0x00004000
+#define IEEE80211_HE_OPERATION_CO_LOCATED_BSS                  0x00008000
+#define IEEE80211_HE_OPERATION_ER_SU_DISABLE                   0x00010000
+#define IEEE80211_HE_OPERATION_BSS_COLOR_MASK                  0x3f000000
+#define IEEE80211_HE_OPERATION_BSS_COLOR_OFFSET                24
+#define IEEE80211_HE_OPERATION_PARTIAL_BSS_COLOR               0x40000000
+#define IEEE80211_HE_OPERATION_BSS_COLOR_DISABLED              0x80000000
 
 /*
  * ieee80211_he_oper_size - calculate 802.11ax HE Operations IE size
@@ -2063,7 +2065,7 @@ ieee80211_he_oper_size(const u8 *he_oper_ie)
        he_oper_params = le32_to_cpu(he_oper->he_oper_params);
        if (he_oper_params & IEEE80211_HE_OPERATION_VHT_OPER_INFO)
                oper_len += 3;
-       if (he_oper_params & IEEE80211_HE_OPERATION_MULTI_BSSID_AP)
+       if (he_oper_params & IEEE80211_HE_OPERATION_CO_LOCATED_BSS)
                oper_len++;
 
        /* Add the first byte (extension ID) to the total length */
@@ -2704,6 +2706,10 @@ enum ieee80211_tdls_actioncode {
  */
 #define WLAN_EXT_CAPA9_FTM_INITIATOR   BIT(7)
 
+/* Defines support for TWT Requester and TWT Responder */
+#define WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT  BIT(5)
+#define WLAN_EXT_CAPA10_TWT_RESPONDER_SUPPORT  BIT(6)
+
 /* TDLS specific payload type in the LLC/SNAP header */
 #define WLAN_TDLS_SNAP_RFTYPE  0x2
 
@@ -3166,4 +3172,57 @@ static inline bool ieee80211_check_tim(const struct ieee80211_tim_ie *tim,
 #define TU_TO_JIFFIES(x)       (usecs_to_jiffies((x) * 1024))
 #define TU_TO_EXP_TIME(x)      (jiffies + TU_TO_JIFFIES(x))
 
+struct element {
+       u8 id;
+       u8 datalen;
+       u8 data[];
+};
+
+/* element iteration helpers */
+#define for_each_element(element, _data, _datalen)                     \
+       for (element = (void *)(_data);                                 \
+            (u8 *)(_data) + (_datalen) - (u8 *)element >=              \
+               sizeof(*element) &&                                     \
+            (u8 *)(_data) + (_datalen) - (u8 *)element >=              \
+               sizeof(*element) + element->datalen;                    \
+            element = (void *)(element->data + element->datalen))
+
+#define for_each_element_id(element, _id, data, datalen)               \
+       for_each_element(element, data, datalen)                        \
+               if (element->id == (_id))
+
+#define for_each_element_extid(element, extid, data, datalen)          \
+       for_each_element(element, data, datalen)                        \
+               if (element->id == WLAN_EID_EXTENSION &&                \
+                   element->datalen > 0 &&                             \
+                   element->data[0] == (extid))
+
+#define for_each_subelement(sub, element)                              \
+       for_each_element(sub, (element)->data, (element)->datalen)
+
+#define for_each_subelement_id(sub, id, element)                       \
+       for_each_element_id(sub, id, (element)->data, (element)->datalen)
+
+#define for_each_subelement_extid(sub, extid, element)                 \
+       for_each_element_extid(sub, extid, (element)->data, (element)->datalen)
+
+/**
+ * for_each_element_completed - determine if element parsing consumed all data
+ * @element: element pointer after for_each_element() or friends
+ * @data: same data pointer as passed to for_each_element() or friends
+ * @datalen: same data length as passed to for_each_element() or friends
+ *
+ * This function returns %true if all the data was parsed or considered
+ * while walking the elements. Only use this if your for_each_element()
+ * loop cannot be broken out of, otherwise it always returns %false.
+ *
+ * If some data was malformed, this returns %false since the last parsed
+ * element will not fill the whole remaining data.
+ */
+static inline bool for_each_element_completed(const struct element *element,
+                                             const void *data, size_t datalen)
+{
+       return (u8 *)element == (u8 *)data + datalen;
+}
+
 #endif /* __LINUX_IEEE80211_H */