Message ID | 20120712133847.18719.77998.stgit@localhost.localdomain |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Alan Cox <alan@lxorguk.ukuu.org.uk> Date: Thu, 12 Jul 2012 14:39:11 +0100 > Signed-off-by: Alan Cox <alna@linux.intel.com> ^^^^ I'm truly astonished that you type in signoffs by hand Alan. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 2012-07-12 at 06:25 -0700, David Miller wrote: > From: Alan Cox <alan@lxorguk.ukuu.org.uk> > Date: Thu, 12 Jul 2012 14:39:11 +0100 > > > Signed-off-by: Alan Cox <alna@linux.intel.com> > ^^^^ > > I'm truly astonished that you type in signoffs by hand Alan. Weel, I do the same ;) Feel free to add my Acked-by: Eric Dumazet <edumazet@google.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Thu, 12 Jul 2012 15:50:21 +0200 > On Thu, 2012-07-12 at 06:25 -0700, David Miller wrote: >> From: Alan Cox <alan@lxorguk.ukuu.org.uk> >> Date: Thu, 12 Jul 2012 14:39:11 +0100 >> >> > Signed-off-by: Alan Cox <alna@linux.intel.com> >> ^^^^ >> >> I'm truly astonished that you type in signoffs by hand Alan. > > Weel, I do the same ;) You guys are weird :-) > Feel free to add my > > Acked-by: Eric Dumazet <edumazet@google.com> Applied, with signoff typo fixed too :-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sched/sch_sfb.c b/net/sched/sch_sfb.c index 74305c8..30ea467 100644 --- a/net/sched/sch_sfb.c +++ b/net/sched/sch_sfb.c @@ -570,6 +570,8 @@ static int sfb_dump(struct Qdisc *sch, struct sk_buff *skb) sch->qstats.backlog = q->qdisc->qstats.backlog; opts = nla_nest_start(skb, TCA_OPTIONS); + if (opts == NULL) + goto nla_put_failure; if (nla_put(skb, TCA_SFB_PARMS, sizeof(opt), &opt)) goto nla_put_failure; return nla_nest_end(skb, opts);