iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qdisc: adjustments for API allowing skb list xmits

Browse Source 
Minor adjustments for merge commit 53fda7f7f9 (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>
This commit is contained in:
Jesper Dangaard Brouer 2014-09-02 16:35:33 +02:00 committed by David S. Miller
parent 4a31498869
commit 10770bc2d1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/sched/sch_generic.c
View File

@ -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,
} }
/* /*
* 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.