| Message ID | 1400231990-10404-1-git-send-email-yangyingliang@huawei.com |
|---|---|
| State | Rejected, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, 2014-05-16 at 17:19 +0800, Yang Yingliang wrote: > If packets are dropped in enqueue(), it should not return > NET_XMIT_SUCCESS but NET_XMIT_DROP. > > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> > --- > net/sched/sch_fq_codel.c | 2 +- > net/sched/sch_hhf.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c > index 0bf432c782c1..303ab0ce23ab 100644 > --- a/net/sched/sch_fq_codel.c > +++ b/net/sched/sch_fq_codel.c > @@ -207,7 +207,7 @@ static int fq_codel_enqueue(struct sk_buff *skb, struct Qdisc *sch) > > /* As we dropped a packet, better let upper stack know this */ > qdisc_tree_decrease_qlen(sch, 1); > - return NET_XMIT_SUCCESS; > + return NET_XMIT_DROP; > } > > /* This is the specific function called from codel_dequeue() > diff --git a/net/sched/sch_hhf.c b/net/sched/sch_hhf.c > index 6aab8619bbb0..a13d1d78ded1 100644 > --- a/net/sched/sch_hhf.c > +++ b/net/sched/sch_hhf.c > @@ -426,7 +426,7 @@ static int hhf_enqueue(struct sk_buff *skb, struct Qdisc *sch) > > /* As we dropped a packet, better let upper stack know this. */ > qdisc_tree_decrease_qlen(sch, 1); > - return NET_XMIT_SUCCESS; > + return NET_XMIT_DROP; > } > > static struct sk_buff *hhf_dequeue(struct Qdisc *sch) NACK I am very tired of these patches. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c index 0bf432c782c1..303ab0ce23ab 100644 --- a/net/sched/sch_fq_codel.c +++ b/net/sched/sch_fq_codel.c @@ -207,7 +207,7 @@ static int fq_codel_enqueue(struct sk_buff *skb, struct Qdisc *sch) /* As we dropped a packet, better let upper stack know this */ qdisc_tree_decrease_qlen(sch, 1); - return NET_XMIT_SUCCESS; + return NET_XMIT_DROP; } /* This is the specific function called from codel_dequeue() diff --git a/net/sched/sch_hhf.c b/net/sched/sch_hhf.c index 6aab8619bbb0..a13d1d78ded1 100644 --- a/net/sched/sch_hhf.c +++ b/net/sched/sch_hhf.c @@ -426,7 +426,7 @@ static int hhf_enqueue(struct sk_buff *skb, struct Qdisc *sch) /* As we dropped a packet, better let upper stack know this. */ qdisc_tree_decrease_qlen(sch, 1); - return NET_XMIT_SUCCESS; + return NET_XMIT_DROP; } static struct sk_buff *hhf_dequeue(struct Qdisc *sch)
If packets are dropped in enqueue(), it should not return NET_XMIT_SUCCESS but NET_XMIT_DROP. Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- net/sched/sch_fq_codel.c | 2 +- net/sched/sch_hhf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)