Merge tag 'please-pull-misc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / net / sched / sch_choke.c

diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c
index ef53ab8d0aaec69628fe6bf497ced92dd5ebc44c..ddd73cb2d7ba4080f0e8f75ddc715cf9cb2a1587 100644 (file)
--- a/net/sched/sch_choke.c
+++ b/net/sched/sch_choke.c
@@ -438,7 +438,8 @@ static int choke_change(struct Qdisc *sch, struct nlattr *opt)
        if (mask != q->tab_mask) {
                struct sk_buff **ntab;
 
-               ntab = kcalloc(mask + 1, sizeof(struct sk_buff *), GFP_KERNEL);
+               ntab = kcalloc(mask + 1, sizeof(struct sk_buff *),
+                              GFP_KERNEL | __GFP_NOWARN);
                if (!ntab)
                        ntab = vzalloc((mask + 1) * sizeof(struct sk_buff *));
                if (!ntab)