wifi: brcmfmac: flowring: simplify flow allocation

Use a flexible array member and kzalloc_flex to combine allocations.
Simplifies code slightly.

Add __counted_by for extra runtime analysis.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Link: https://patch.msgid.link/20260608051102.6698-1-rosenp@gmail.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
index df7e3bee19f2584f7846651379fb1f96b462c1ca..35cbcea0abc9a8fe8c50f8bd798993dd3944b579 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
@@ -360,20 +360,15 @@ struct brcmf_flowring *brcmf_flowring_attach(struct device *dev, u16 nrofrings)
        struct brcmf_flowring *flow;
        u32 i;
 
-       flow = kzalloc_obj(*flow);
+       flow = kzalloc_flex(*flow, rings, nrofrings);
        if (flow) {
-               flow->dev = dev;
                flow->nrofrings = nrofrings;
+               flow->dev = dev;
                spin_lock_init(&flow->block_lock);
                for (i = 0; i < ARRAY_SIZE(flow->addr_mode); i++)
                        flow->addr_mode[i] = ADDR_INDIRECT;
                for (i = 0; i < ARRAY_SIZE(flow->hash); i++)
                        flow->hash[i].ifidx = BRCMF_FLOWRING_INVALID_IFIDX;
-               flow->rings = kzalloc_objs(*flow->rings, nrofrings);
-               if (!flow->rings) {
-                       kfree(flow);
-                       flow = NULL;
-               }
        }
 
        return flow;
@@ -399,7 +394,6 @@ void brcmf_flowring_detach(struct brcmf_flowring *flow)
                search = search->next;
                kfree(remove);
        }
-       kfree(flow->rings);
        kfree(flow);
 }
 

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.h
index 818882b0fd0114bc329311ef041ce7be8d60805f..f3d511f9a3c9ae5496ea0925f4d3d43fc1764f35 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.h
@@ -38,12 +38,12 @@ struct brcmf_flowring_tdls_entry {
 struct brcmf_flowring {
        struct device *dev;
        struct brcmf_flowring_hash hash[BRCMF_FLOWRING_HASHSIZE];
-       struct brcmf_flowring_ring **rings;
        spinlock_t block_lock;
        enum proto_addr_mode addr_mode[BRCMF_MAX_IFS];
        u16 nrofrings;
        bool tdls_active;
        struct brcmf_flowring_tdls_entry *tdls_entry;
+       struct brcmf_flowring_ring *rings[] __counted_by(nrofrings);
 };