diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2021-12-17 11:33:33 +0100 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2021-12-17 11:33:33 +0100 |
| commit | 8ff81044f2a3b90c7d3588824b9fdf1372f8e4c3 (patch) | |
| tree | 92b3d56e173a3bf1b17a9387f5d126a2f3dfb216 /drivers/net/wireguard/ratelimiter.c | |
| parent | e295886bcbaef6f7e4740d16d12d9f6b72908226 (diff) | |
| parent | afd02352ddd8fd448620078b1a2784b71b74e60a (diff) | |
| download | wireguard-linux-trimmed-8ff81044f2a3b90c7d3588824b9fdf1372f8e4c3.tar.gz wireguard-linux-trimmed-8ff81044f2a3b90c7d3588824b9fdf1372f8e4c3.zip | |
Merge drm/drm-next into drm-misc-next-fixes
Backmerging to bring drm-misc-next-fixes up to the latest state for
the current release cycle.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/net/wireguard/ratelimiter.c')
| -rw-r--r-- | drivers/net/wireguard/ratelimiter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireguard/ratelimiter.c b/drivers/net/wireguard/ratelimiter.c index 3fedd1d..dd55e5c 100644 --- a/drivers/net/wireguard/ratelimiter.c +++ b/drivers/net/wireguard/ratelimiter.c @@ -176,12 +176,12 @@ int wg_ratelimiter_init(void) (1U << 14) / sizeof(struct hlist_head))); max_entries = table_size * 8; - table_v4 = kvzalloc(table_size * sizeof(*table_v4), GFP_KERNEL); + table_v4 = kvcalloc(table_size, sizeof(*table_v4), GFP_KERNEL); if (unlikely(!table_v4)) goto err_kmemcache; #if IS_ENABLED(CONFIG_IPV6) - table_v6 = kvzalloc(table_size * sizeof(*table_v6), GFP_KERNEL); + table_v6 = kvcalloc(table_size, sizeof(*table_v6), GFP_KERNEL); if (unlikely(!table_v6)) { kvfree(table_v4); goto err_kmemcache; |