diff options
| author | Bjoern A. Zeeb <bz@FreeBSD.org> | 2025-08-11 03:42:16 +0000 |
|---|---|---|
| committer | Bjoern A. Zeeb <bz@FreeBSD.org> | 2025-08-11 03:42:16 +0000 |
| commit | a6a613da12da2c540267b07219fef9bd655aa01b (patch) | |
| tree | 10d7728a26095c4d97633e8f487f27d50a059682 /dfs_pattern_detector.c | |
| parent | 9c6b6723ca8440203bd44eabf7451ff3a7df20e4 (diff) | |
ath-common: update common Atheros/QCA codevendor/Linux/ath-common/torvalds-v6.16
This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
038d61fd642278bab63ee8ef722c50d10ab01e8f ( tag: v6.16 ).
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'dfs_pattern_detector.c')
| -rw-r--r-- | dfs_pattern_detector.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/dfs_pattern_detector.c b/dfs_pattern_detector.c index 27f4d74a41c8..700da9f4531e 100644 --- a/dfs_pattern_detector.c +++ b/dfs_pattern_detector.c @@ -161,7 +161,7 @@ get_dfs_domain_radar_types(enum nl80211_dfs_regions region) struct channel_detector { struct list_head head; u16 freq; - struct pri_detector **detectors; + struct pri_detector *detectors[]; }; /* channel_detector_reset() - reset detector lines for a given channel */ @@ -183,14 +183,13 @@ static void channel_detector_exit(struct dfs_pattern_detector *dpd, if (cd == NULL) return; list_del(&cd->head); - if (cd->detectors) { - for (i = 0; i < dpd->num_radar_types; i++) { - struct pri_detector *de = cd->detectors[i]; - if (de != NULL) - de->exit(de); - } + + for (i = 0; i < dpd->num_radar_types; i++) { + struct pri_detector *de = cd->detectors[i]; + if (de != NULL) + de->exit(de); } - kfree(cd->detectors); + kfree(cd); } @@ -200,16 +199,12 @@ channel_detector_create(struct dfs_pattern_detector *dpd, u16 freq) u32 i; struct channel_detector *cd; - cd = kmalloc(sizeof(*cd), GFP_ATOMIC); + cd = kzalloc(struct_size(cd, detectors, dpd->num_radar_types), GFP_ATOMIC); if (cd == NULL) goto fail; INIT_LIST_HEAD(&cd->head); cd->freq = freq; - cd->detectors = kmalloc_array(dpd->num_radar_types, - sizeof(*cd->detectors), GFP_ATOMIC); - if (cd->detectors == NULL) - goto fail; for (i = 0; i < dpd->num_radar_types; i++) { const struct radar_detector_specs *rs = &dpd->radar_spec[i]; |