diff options
| author | Jesper Dangaard Brouer <brouer@redhat.com> | 2014-09-02 16:35:33 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-02 23:06:17 +0200 |
| commit | 10770bc2d1702e05575db0072e1ebbc06d0b270e (patch) | |
| tree | b1e6c64a0e70edb3e38d69fff4404ea2bf0ae5d8 | |
| parent | ethernet: arc: remove unused dev (diff) | |
| download | linux-10770bc2d1702e05575db0072e1ebbc06d0b270e.tar.xz linux-10770bc2d1702e05575db0072e1ebbc06d0b270e.zip | |
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.c | 8 |
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, * 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. |