diff options
| author | David S. Miller <davem@davemloft.net> | 2019-11-08 11:37:24 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-08 11:37:24 -0800 |
| commit | b05f5b4a9b10a7d60411a279322f513b4a8fa340 (patch) | |
| tree | 4867f9e62dcb8e91ddec2fb02c6552c8988ed594 /include/net | |
| parent | e4dd5608033efe7b6030cde359bfdbaeb73bc22d (diff) | |
| parent | 285531f9e6774e3be71da6673d475ff1a088d675 (diff) | |
Merge tag 'mac80211-for-net-2019-11-08' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Three small fixes:
* we hit a failure path bug related to
ieee80211_txq_setup_flows()
* also use kvmalloc() to make that less likely
* fix a timing value shortly after boot (during
INITIAL_JIFFIES)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/fq_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/fq_impl.h b/include/net/fq_impl.h index 107c0d700ed6..38a9a3d1222b 100644 --- a/include/net/fq_impl.h +++ b/include/net/fq_impl.h @@ -313,7 +313,7 @@ static int fq_init(struct fq *fq, int flows_cnt) fq->limit = 8192; fq->memory_limit = 16 << 20; /* 16 MBytes */ - fq->flows = kcalloc(fq->flows_cnt, sizeof(fq->flows[0]), GFP_KERNEL); + fq->flows = kvcalloc(fq->flows_cnt, sizeof(fq->flows[0]), GFP_KERNEL); if (!fq->flows) return -ENOMEM; @@ -331,7 +331,7 @@ static void fq_reset(struct fq *fq, for (i = 0; i < fq->flows_cnt; i++) fq_flow_reset(fq, &fq->flows[i], free_func); - kfree(fq->flows); + kvfree(fq->flows); fq->flows = NULL; } |