Commit 10770bc2 authored by Jesper Dangaard Brouer's avatar Jesper Dangaard Brouer Committed by David S. Miller

qdisc: adjustments for API allowing skb list xmits

Minor adjustments for merge commit 53fda7f7 (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: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4a314988
...@@ -93,7 +93,7 @@ static inline int handle_dev_cpu_collision(struct sk_buff *skb, ...@@ -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 * detect it by checking xmit owner and drop the packet when
* deadloop is detected. Return OK to try the next skb. * 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", net_warn_ratelimited("Dead loop on netdevice %s, fix it urgently!\n",
dev_queue->dev->name); dev_queue->dev->name);
ret = qdisc_qlen(q); ret = qdisc_qlen(q);
...@@ -110,9 +110,9 @@ static inline int handle_dev_cpu_collision(struct sk_buff *skb, ...@@ -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 * Transmit possibly several skbs, and handle the return status as
* __QDISC___STATE_RUNNING bit guarantees that only one CPU can execute this * required. Holding the __QDISC___STATE_RUNNING bit guarantees that
* function. * only one CPU can execute this function.
* *
* Returns to the caller: * Returns to the caller:
* 0 - queue is empty or throttled. * 0 - queue is empty or throttled.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment