wifi: mac80211: remove element scratch_len

This isn't used, and there isn't really a good way it
could be used, so just remove that.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index a0a7839cb9614010e9ab4d892e08b20bf0255194..007b36c7db53e1ec67bcf28e0960c2bcbab89c68 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -2269,8 +2269,6 @@ static inline void ieee80211_tx_skb(struct ieee80211_sub_if_data *sdata,
  *     (or re-association) response frame if this is given
  * @from_ap: frame is received from an AP (currently used only
  *     for EHT capabilities parsing)
- * @scratch_len: if non zero, specifies the requested length of the scratch
- *      buffer; otherwise, 'len' is used.
  */
 struct ieee80211_elems_parse_params {
        const u8 *start;
@@ -2281,7 +2279,6 @@ struct ieee80211_elems_parse_params {
        struct cfg80211_bss *bss;
        int link_id;
        bool from_ap;
-       size_t scratch_len;
 };
 
 struct ieee802_11_elems *

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 75c517dc8beef7323c7204ec8e91bd634d2902ba..22871e4a9f0f2223bf13092da40b05b280168ffa 100644 (file)
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1604,7 +1604,7 @@ ieee802_11_parse_elems_full(struct ieee80211_elems_parse_params *params)
        const struct element *non_inherit = NULL;
        u8 *nontransmitted_profile;
        int nontransmitted_profile_len = 0;
-       size_t scratch_len = params->scratch_len ?: 3 * params->len;
+       size_t scratch_len = 3 * params->len;
 
        elems = kzalloc(sizeof(*elems) + scratch_len, GFP_ATOMIC);
        if (!elems)