Skip to content

Commit

Permalink
qdisc: adjustments for API allowing skb list xmits
Browse files Browse the repository at this point in the history
Minor adjustments for merge commit 53fda7f (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>
  • Loading branch information
Jesper Dangaard Brouer authored and David S. Miller committed Sep 2, 2014
1 parent 4a31498 commit 10770bc
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions net/sched/sch_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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.
Expand Down

0 comments on commit 10770bc

Please sign in to comment.