From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id D4D663B29D for ; Thu, 25 Jun 2020 07:55:13 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593086113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oS+tjJRTXWkIBJiF60BGiX9Deix+p/MPPW7LrDM4LQg=; b=O38EpymfpLv7ScNU6vfp3wvsRk2hHC4rBOM6+haqfQzImVkz/cHiY5qzN2xLngpmSrbQMj /0EKCxxnqNEVWYABJOsMUB4y1GWSTuJCV/sKo8WOqpssjW+hgsYt12GmAkINiF9bwuRDyB tkeKzmpjJC8wzbNzbrkNOCW+RcPjlTY= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-407-Cf5ENBHcM7OLnCof9JZ0Xg-1; Thu, 25 Jun 2020 07:55:11 -0400 X-MC-Unique: Cf5ENBHcM7OLnCof9JZ0Xg-1 Received: by mail-wm1-f72.google.com with SMTP id c66so6843934wma.8 for ; Thu, 25 Jun 2020 04:55:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=oS+tjJRTXWkIBJiF60BGiX9Deix+p/MPPW7LrDM4LQg=; b=dQa8MaF0bTUJQ7zb79cdfVUv2hsdtwU7Qvh9g9x29C1xCusTu8Jmpvm6Iqp8+/0a02 ux1l83jlPiloxQh10n7HXPCrArpm2aLC6Xn3RwYkCB+P5lMyuvc1wGetXzaxbVMtqhdd W/cx3f3vuUFw1y56Tb/J7CDKh6YYeNmosxgbdsK369U4kmUCnO1+7QReA7b/8Y/QG9xk lF337qRfIUNADdEDXIPV10xPhJ/hG4RaXobDB0mIaJaS9sycg7K/Rm+WbqRLg0fSyAgH 5C+RJqKP1FkK+sav5IzbFThn4Ugj8Q6oa7u6ANzEHdH3Fb9JKQtBg9+VrheKezLApG/i P5bw== X-Gm-Message-State: AOAM530CIQz+bgXJqwcUXLSP9aMm8R8uKXwxYQVCmpABZIVs0e/ZJNL2 MaznjfiVJ8tsNeu58LSZ3s7YJFisku1bWXJ8XCMQbV3atdu3NLl5m5QO5S9od92Rtaqqxx0icvu vCg5qJHEAz8Hq4gHQR0s6qQ== X-Received: by 2002:adf:a507:: with SMTP id i7mr39280024wrb.0.1593086110797; Thu, 25 Jun 2020 04:55:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjqfJVd3WkZS8rf/Eu0Ta02+8zhyOKxM75IA3tL9xrh0OYYczzH8cn3T+qkjTjJplc9T9E0g== X-Received: by 2002:adf:a507:: with SMTP id i7mr39280013wrb.0.1593086110634; Thu, 25 Jun 2020 04:55:10 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id v20sm31975789wrb.51.2020.06.25.04.55.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 04:55:09 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 5729F1814F9; Thu, 25 Jun 2020 13:55:08 +0200 (CEST) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: David Miller Cc: netdev@vger.kernel.org, cake@lists.bufferbloat.net Date: Thu, 25 Jun 2020 13:55:08 +0200 Message-ID: <159308610826.190211.15296927891260930838.stgit@toke.dk> In-Reply-To: <159308610282.190211.9431406149182757758.stgit@toke.dk> References: <159308610282.190211.9431406149182757758.stgit@toke.dk> User-Agent: StGit/0.23 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Subject: [Cake] [PATCH net-next 5/5] sch_cake: fix a few style nits X-BeenThere: cake@lists.bufferbloat.net X-Mailman-Version: 2.1.20 Precedence: list List-Id: Cake - FQ_codel the next generation List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2020 11:55:13 -0000 From: Toke Høiland-Jørgensen I spotted a few nits when comparing the in-tree version of sch_cake with the out-of-tree one: A redundant error variable declaration shadowing an outer declaration, and an indentation alignment issue. Fix both of these to minimise the delta. Signed-off-by: Toke Høiland-Jørgensen --- net/sched/sch_cake.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c index 78a702a4e1d4..e075913b2fd7 100644 --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c @@ -2761,7 +2761,7 @@ static int cake_init(struct Qdisc *sch, struct nlattr *opt, qdisc_watchdog_init(&q->watchdog, sch); if (opt) { - int err = cake_change(sch, opt, extack); + err = cake_change(sch, opt, extack); if (err) return err; @@ -3078,7 +3078,7 @@ static int cake_dump_class_stats(struct Qdisc *sch, unsigned long cl, PUT_STAT_S32(BLUE_TIMER_US, ktime_to_us( ktime_sub(now, - flow->cvars.blue_timer))); + flow->cvars.blue_timer))); } if (flow->cvars.dropping) { PUT_STAT_S32(DROP_NEXT_US,