From patchwork Fri May 16 09:19:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 349531 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AB281140087 for ; Fri, 16 May 2014 19:20:05 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756401AbaEPJT6 (ORCPT ); Fri, 16 May 2014 05:19:58 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:32489 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751475AbaEPJT5 (ORCPT ); Fri, 16 May 2014 05:19:57 -0400 Received: from 172.24.2.119 (EHLO szxeml207-edg.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id BVN91965; Fri, 16 May 2014 17:19:53 +0800 (CST) Received: from SZXEML403-HUB.china.huawei.com (10.82.67.35) by szxeml207-edg.china.huawei.com (172.24.2.56) with Microsoft SMTP Server (TLS) id 14.3.158.1; Fri, 16 May 2014 17:19:50 +0800 Received: from localhost (10.177.18.231) by szxeml403-hub.china.huawei.com (10.82.67.35) with Microsoft SMTP Server id 14.3.158.1; Fri, 16 May 2014 17:19:50 +0800 From: Yang Yingliang To: CC: , , , Subject: [PATCH net-next] pkt_sched: return NET_XMIT_DROP when packet is dropped Date: Fri, 16 May 2014 17:19:50 +0800 Message-ID: <1400231990-10404-1-git-send-email-yangyingliang@huawei.com> X-Mailer: git-send-email 1.8.1.msysgit.1 MIME-Version: 1.0 X-Originating-IP: [10.177.18.231] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If packets are dropped in enqueue(), it should not return NET_XMIT_SUCCESS but NET_XMIT_DROP. Signed-off-by: Yang Yingliang --- 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)