From patchwork Tue Dec 9 10:21:38 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarek Poplawski X-Patchwork-Id: 12910 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 93B4ADDED5 for ; Tue, 9 Dec 2008 21:21:55 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752718AbYLIKVq (ORCPT ); Tue, 9 Dec 2008 05:21:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752700AbYLIKVp (ORCPT ); Tue, 9 Dec 2008 05:21:45 -0500 Received: from ug-out-1314.google.com ([66.249.92.170]:44025 "EHLO ug-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752695AbYLIKVo (ORCPT ); Tue, 9 Dec 2008 05:21:44 -0500 Received: by ug-out-1314.google.com with SMTP id 39so1033647ugf.37 for ; Tue, 09 Dec 2008 02:21:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:x-mutt-fcc :x-mutt-fcc:user-agent; bh=2L4mgKECqsl5qyBYZ/juu8k24UZEJoNUOI9ST+FsdUM=; b=DBHE8NqM5WsCSqOjLs9xB892QQB52fXLGZnkQ01607mot3cMeOjSpOHHpQXEz7KCI/ Hw6a4WujS5riJ4ht+1lPMMVLBsm92k1Svuk2zjbLMi3R25XruiOgLmQQ3bEPPyT4iN0M go0zso/McUFIF5Mo9MfF2/74wLj3dB9033zwg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:x-mutt-fcc:user-agent; b=VoDopPHqjTo9tRDDjWLwykan0xA5w2ZfYR/ID4MXotqpn00n2714gHTO0UKrZRggVy mgstZp0MMhkvrd8HaBE/JtXiDCUggA5KyDk0gfG58xN4DesK0oVZTro0KPEFk9kQS9pM inUlK2YNFPzqjfpO944xD9j6zSjS/Lt7/Pi+Y= Received: by 10.66.222.6 with SMTP id u6mr3150127ugg.19.1228818103180; Tue, 09 Dec 2008 02:21:43 -0800 (PST) Received: from ff.dom.local (bv170.internetdsl.tpnet.pl [80.53.205.170]) by mx.google.com with ESMTPS id m38sm6685622ugd.51.2008.12.09.02.21.41 (version=SSLv3 cipher=RC4-MD5); Tue, 09 Dec 2008 02:21:42 -0800 (PST) Date: Tue, 9 Dec 2008 10:21:38 +0000 From: Jarek Poplawski To: David Miller Cc: Martin Devera , Patrick McHardy , netdev@vger.kernel.org Subject: [PATCH 4/6] pkt_sched: sch_htb: Change if () check in htb_dequeue() Message-ID: <20081209102138.GD14862@ff.dom.local> MIME-Version: 1.0 Content-Disposition: inline X-Mutt-Fcc: =outbox X-Mutt-Fcc: =outbox User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Skip "event" in if () in htb_dequeue(): it's always > 0 at this place. Signed-off-by: Jarek Poplawski --- net/sched/sch_htb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index b241ac6..2e0a74c 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -879,7 +879,7 @@ static struct sk_buff *htb_dequeue(struct Qdisc *sch) } else event = q->near_ev_cache[level]; - if (event && next_event > event) + if (next_event > event) next_event = event; m = ~q->row_mask[level];