aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesper Dangaard Brouer <brouer@redhat.com>2014-09-02 10:35:33 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-02 17:06:17 -0400
commit10770bc2d1702e05575db0072e1ebbc06d0b270e (patch)
treeb1e6c64a0e70edb3e38d69fff4404ea2bf0ae5d8
parent4a31498869a944e6c4b2aaab71b8b95482d1da53 (diff)
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 <brouer@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sched/sch_generic.c8
1 files changed, 4 insertions, 4 deletions
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,
93 * detect it by checking xmit owner and drop the packet when 93 * detect it by checking xmit owner and drop the packet when
94 * deadloop is detected. Return OK to try the next skb. 94 * deadloop is detected. Return OK to try the next skb.
95 */ 95 */
96 kfree_skb(skb); 96 kfree_skb_list(skb);
97 net_warn_ratelimited("Dead loop on netdevice %s, fix it urgently!\n", 97 net_warn_ratelimited("Dead loop on netdevice %s, fix it urgently!\n",
98 dev_queue->dev->name); 98 dev_queue->dev->name);
99 ret = qdisc_qlen(q); 99 ret = qdisc_qlen(q);
@@ -110,9 +110,9 @@ static inline int handle_dev_cpu_collision(struct sk_buff *skb,
110} 110}
111 111
112/* 112/*
113 * Transmit one skb, and handle the return status as required. Holding the 113 * Transmit possibly several skbs, and handle the return status as
114 * __QDISC___STATE_RUNNING bit guarantees that only one CPU can execute this 114 * required. Holding the __QDISC___STATE_RUNNING bit guarantees that
115 * function. 115 * only one CPU can execute this function.
116 * 116 *
117 * Returns to the caller: 117 * Returns to the caller:
118 * 0 - queue is empty or throttled. 118 * 0 - queue is empty or throttled.