From: Jesper Dangaard Brouer Date: Tue, 2 Sep 2014 14:35:33 +0000 (+0200) Subject: qdisc: adjustments for API allowing skb list xmits X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=10770bc2d1;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git qdisc: adjustments for API allowing skb list xmits Minor adjustments for merge commit 53fda7f7f9e (Merge branch 'xmit_list') that allows us to work with a list of SKBs. Update code doc to function sch_direct_xmit(). In handle_dev_cpu_collision() use kfree_skb_list() in error handling. Signed-off-by: Jesper Dangaard Brouer Signed-off-by: David S. Miller --- diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index a8bf9f9928bd..5b261e91bdbd 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -93,7 +93,7 @@ static inline int handle_dev_cpu_collision(struct sk_buff *skb, * detect it by checking xmit owner and drop the packet when * deadloop is detected. Return OK to try the next skb. */ - kfree_skb(skb); + kfree_skb_list(skb); net_warn_ratelimited("Dead loop on netdevice %s, fix it urgently!\n", dev_queue->dev->name); ret = qdisc_qlen(q); @@ -110,9 +110,9 @@ static inline int handle_dev_cpu_collision(struct sk_buff *skb, } /* - * Transmit one skb, and handle the return status as required. Holding the - * __QDISC___STATE_RUNNING bit guarantees that only one CPU can execute this - * function. + * Transmit possibly several skbs, and handle the return status as + * required. Holding the __QDISC___STATE_RUNNING bit guarantees that + * only one CPU can execute this function. * * Returns to the caller: * 0 - queue is empty or throttled.