diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-16 02:11:14 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-16 02:11:14 -0500 |
| commit | b26e478f8fd5b575684f021b05a5c6236ebb911a (patch) | |
| tree | 27d3b3eaf3fe10d05319ad3395b2569ad5f8f6d0 /net/sched | |
| parent | bcebcc468a6bcd3820fe9ad36b34220563efc93a (diff) | |
| parent | bb3c36863e8001fc21a88bebfdead4da4c23e848 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/freescale/fsl_pq_mdio.c
net/batman-adv/translation-table.c
net/ipv6/route.c
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_gred.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c index a1b7407ac2a4..1b5e63126cb3 100644 --- a/net/sched/sch_gred.c +++ b/net/sched/sch_gred.c | |||
| @@ -386,7 +386,7 @@ static inline int gred_change_vq(struct Qdisc *sch, int dp, | |||
| 386 | struct gred_sched_data *q; | 386 | struct gred_sched_data *q; |
| 387 | 387 | ||
| 388 | if (table->tab[dp] == NULL) { | 388 | if (table->tab[dp] == NULL) { |
| 389 | table->tab[dp] = kzalloc(sizeof(*q), GFP_KERNEL); | 389 | table->tab[dp] = kzalloc(sizeof(*q), GFP_ATOMIC); |
| 390 | if (table->tab[dp] == NULL) | 390 | if (table->tab[dp] == NULL) |
| 391 | return -ENOMEM; | 391 | return -ENOMEM; |
| 392 | } | 392 | } |