mac80211: move CRC into struct ieee802_11_elems

We're currently returning this value, but to prepare for
returning the allocated structure, move it into there.

Link: https://lore.kernel.org/r/20210920154009.479b8ebf999d.If0d4ba75ee38998dc3eeae25058aa748efcb2fc9@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index d74031bb4ae6e76bedece7959644aa83fe14a129..6a129a08bc9bf47e1fc1b704c1d98d7c894e2990 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1507,6 +1507,7 @@ struct ieee80211_csa_ie {
 struct ieee802_11_elems {
        const u8 *ie_start;
        size_t total_len;
+       u32 crc;
 
        /* pointers to IEs */
        const struct ieee80211_tdls_lnkie *lnk_id;
@@ -2193,10 +2194,10 @@ static inline void ieee80211_tx_skb(struct ieee80211_sub_if_data *sdata,
        ieee80211_tx_skb_tid(sdata, skb, 7);
 }
 
-u32 ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action,
-                              struct ieee802_11_elems *elems,
-                              u64 filter, u32 crc, u8 *transmitter_bssid,
-                              u8 *bss_bssid);
+void ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action,
+                               struct ieee802_11_elems *elems,
+                               u64 filter, u32 crc, u8 *transmitter_bssid,
+                               u8 *bss_bssid);
 static inline void ieee802_11_parse_elems(const u8 *start, size_t len,
                                          bool action,
                                          struct ieee802_11_elems *elems,

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index c0ea3b1aa9e1cd88bb348bf3b947d7430d014a20..39b3ed89e0dabd1d5e9b05e7bf507f9ad65313c4 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -4070,10 +4070,11 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
         */
        if (!ieee80211_is_s1g_beacon(hdr->frame_control))
                ncrc = crc32_be(0, (void *)&mgmt->u.beacon.beacon_int, 4);
-       ncrc = ieee802_11_parse_elems_crc(variable,
-                                         len - baselen, false, &elems,
-                                         care_about_ies, ncrc,
-                                         mgmt->bssid, bssid);
+       ieee802_11_parse_elems_crc(variable,
+                                  len - baselen, false, &elems,
+                                  care_about_ies, ncrc,
+                                  mgmt->bssid, bssid);
+       ncrc = elems.crc;
 
        if (ieee80211_hw_check(&local->hw, PS_NULLFUNC_STACK) &&
            ieee80211_check_tim(elems.tim, elems.tim_len, bss_conf->aid)) {

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 49cb96d251695a7d8de833fdd47635ab6e25b18c..43ccad8b24c78927bae797f12aa27fce59c74dc5 100644 (file)
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1461,10 +1461,10 @@ static size_t ieee802_11_find_bssid_profile(const u8 *start, size_t len,
        return found ? profile_len : 0;
 }
 
-u32 ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action,
-                              struct ieee802_11_elems *elems,
-                              u64 filter, u32 crc, u8 *transmitter_bssid,
-                              u8 *bss_bssid)
+void ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action,
+                               struct ieee802_11_elems *elems,
+                               u64 filter, u32 crc, u8 *transmitter_bssid,
+                               u8 *bss_bssid)
 {
        const struct element *non_inherit = NULL;
        u8 *nontransmitted_profile;
@@ -1516,7 +1516,7 @@ u32 ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action,
 
        kfree(nontransmitted_profile);
 
-       return crc;
+       elems->crc = crc;
 }
 
 void ieee80211_regulatory_limit_wmm_params(struct ieee80211_sub_if_data *sdata,