Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -257,12 +257,7 @@ static int multiq_init(struct Qdisc *sch, struct nlattr *opt)
|
||||
for (i = 0; i < q->max_bands; i++)
|
||||
q->queues[i] = &noop_qdisc;
|
||||
|
||||
err = multiq_tune(sch, opt);
|
||||
|
||||
if (err)
|
||||
kfree(q->queues);
|
||||
|
||||
return err;
|
||||
return multiq_tune(sch, opt);
|
||||
}
|
||||
|
||||
static int multiq_dump(struct Qdisc *sch, struct sk_buff *skb)
|
||||
|
Reference in New Issue
Block a user