From patchwork Sat Feb 9 16:45:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 219406 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 0A9EA2C008D for ; Sun, 10 Feb 2013 03:45:42 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932449Ab3BIQpj (ORCPT ); Sat, 9 Feb 2013 11:45:39 -0500 Received: from mail-ee0-f44.google.com ([74.125.83.44]:39440 "EHLO mail-ee0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932446Ab3BIQpi (ORCPT ); Sat, 9 Feb 2013 11:45:38 -0500 Received: by mail-ee0-f44.google.com with SMTP id l10so2559645eei.17 for ; Sat, 09 Feb 2013 08:45:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=DbAMNvqycknq5Xm/yTFEocyrJCFCOZ8BIo4HKInpqVo=; b=SYQm39OZ7BDN6uv7VCz+WxSd13MoueLqE97TIbBt+Wq5NtB/+OYZN6YfmwvcGGO/16 vtI2ZwCnOGhmIwjIGXeu1j4fXwUuDA4iwLKCfxL7e53bgYg0l4EeEODV8B7pyVfT0AGs sTJtNHFsJOiTTSsdCZS1h0buG8Gn3K6hnr+LvYXdF5YpMiaoAQ9LnqBLS0BRss9v8lqB kUTnnBf+WV7ZAk48MzQ87Pyh3vIsQS3kmXNZHcdCz9zLeEE3tjlQO54JaSun9DkiY40W oJ3B7J4lgTm5HFh+cM0GE8SR7jizMLFqzxy362nHGcQZxth58N7gB5x0FTscbr3sdQ/C UM2g== X-Received: by 10.14.220.1 with SMTP id n1mr29004447eep.16.1360428336583; Sat, 09 Feb 2013 08:45:36 -0800 (PST) Received: from localhost (sun-0.pirko.cz. [84.16.102.25]) by mx.google.com with ESMTPS id a1sm27866030eep.2.2013.02.09.08.45.34 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 09 Feb 2013 08:45:35 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, jhs@mojatatu.com, kuznet@ms2.inr.ac.ru, j.vimal@gmail.com Subject: [patch net-next v3 07/11] tbf: ignore max_size check for gso skbs Date: Sat, 9 Feb 2013 17:45:08 +0100 Message-Id: <1360428312-1277-8-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1360428312-1277-1-git-send-email-jiri@resnulli.us> References: <1360428312-1277-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQlVVYfl7mAypvL5O3liWRcKg2LsDJc6/wrr/vwaHz04ATJ/fjDA8Thxalvt3KO6lKXcqtYB Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This check made bigger packets incorrectly dropped. Remove this limitation for gso skbs. Signed-off-by: Jiri Pirko Acked-by: Eric Dumazet --- net/sched/sch_tbf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c index e05710a..dc562a8 100644 --- a/net/sched/sch_tbf.c +++ b/net/sched/sch_tbf.c @@ -121,7 +121,7 @@ static int tbf_enqueue(struct sk_buff *skb, struct Qdisc *sch) struct tbf_sched_data *q = qdisc_priv(sch); int ret; - if (qdisc_pkt_len(skb) > q->max_size) + if (qdisc_pkt_len(skb) > q->max_size && !skb_is_gso(skb)) return qdisc_reshape_fail(skb, sch); ret = qdisc_enqueue(skb, q->qdisc);