Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux.git] / net / sched / sch_choke.c

diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c
index dba70377bbd9793f8ab0ff3a0f1703d96870b8e0..a36974e9c601eca97ea98501f0c05f75d0a9fe3e 100644 (file)
--- a/net/sched/sch_choke.c
+++ b/net/sched/sch_choke.c
@@ -377,7 +377,7 @@ static int choke_change(struct Qdisc *sch, struct nlattr *opt,
        if (mask != q->tab_mask) {
                struct sk_buff **ntab;
 
-               ntab = kvmalloc_array((mask + 1), sizeof(struct sk_buff *), GFP_KERNEL | __GFP_ZERO);
+               ntab = kvcalloc(mask + 1, sizeof(struct sk_buff *), GFP_KERNEL);
                if (!ntab)
                        return -ENOMEM;