| Message ID | 20140902143524.1918.70967.stgit@dragon |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, 2014-09-02 at 16:35 +0200, Jesper Dangaard Brouer wrote: > 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 <brouer@redhat.com> > --- Please fix all other similar issues in a single patch. qdisc_reset() and qdisc_destroy() are buggy as well. -- 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: Jesper Dangaard Brouer <brouer@redhat.com> Date: Tue, 02 Sep 2014 16:35:33 +0200 > 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 <brouer@redhat.com> Applied, thanks for catching the kfree_skb_list() issue. -- 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_generic.c b/net/sched/sch_generic.c index a8bf9f9..5b261e9 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.
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 <brouer@redhat.com> --- net/sched/sch_generic.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) -- 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