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 [205.139.110.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 699EE3CB46 for ; Thu, 25 Jun 2020 16:12:17 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593115937; 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=epUbAMlVxZu5S6QNhQY9u/K2VMd6EIBVfXGl2Kn/Ahc=; b=gaQtssNALf5AYBzSJBJouvpsySGr5wi1TJy53AXixOTmKby4Kp9zIwTC8Wc3lcoBMQIMqv o8DqpsVDm88mx60oH5uh3DYoVWUxfO1CzqmPExV9GJ0cz+1ZbO7SWWPq3YPAexa2rGeeJm 6yBmpfdldI+9IRa615Z6mGcmY3V2lNw= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-206-tQdKchpqNS6gS-8EPFaHuw-1; Thu, 25 Jun 2020 16:12:12 -0400 X-MC-Unique: tQdKchpqNS6gS-8EPFaHuw-1 Received: by mail-ej1-f70.google.com with SMTP id h26so5772857ejb.5 for ; Thu, 25 Jun 2020 13:12:12 -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=epUbAMlVxZu5S6QNhQY9u/K2VMd6EIBVfXGl2Kn/Ahc=; b=ZCwZvmMav/BH7ave/Xep/bWeVxdwOFDgU32S21AlcVIHmdVL2xdhfFWdp7K/b9GWmK HCjwZ7KfOBO0Tdi53xiZ6UDQbPchDaZ1Z04WCT3gwWOc2OMAKq4bjEAdD322U38iDxO7 55AwdKi0/3xrkKjNlZb+qWl0A4TQXga5ID4hQQgtoTUAz1oQjyJ3tZ5m7DjYbLQ07X1i i3zCvTyC4mRFU7V+HeGu+XAmNU/gns9CtxeqKOaG83qYO0G+KIyUt4z+CVW3XteMkr38 AY/wpsoWSXascFAY+tPzwsu0ssLbZImcQ1pZSGeYvn89bCY9E6mZjKWpvViZldaAJLKm bR3g== X-Gm-Message-State: AOAM530cpspRy1MqpeASI7wmHRhZbN0kYwS6uuzzSEIfrIyRvUoxSehZ E1K7uIYDb11wPzYbVXCJDjCf/Q4dWcRIvfmWPCj2NdDyAxth16FknsZ16Bkg/24i16tF38bbjtH VbeK1PBWpU23cWGzt/8n34A== X-Received: by 2002:a05:6402:b4b:: with SMTP id bx11mr8584690edb.286.1593115931416; Thu, 25 Jun 2020 13:12:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy21WLj5k8KlY5WJysNtXwMo9tGZQb/0mudpfAo6UiV7lbH1mtRWTn9rLRAHpS5XmsTnEtPaQ== X-Received: by 2002:a05:6402:b4b:: with SMTP id bx11mr8584678edb.286.1593115931254; Thu, 25 Jun 2020 13:12:11 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id p13sm18876978edq.50.2020.06.25.13.12.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 13:12:09 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 6796D1814FA; Thu, 25 Jun 2020 22:12:09 +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 22:12:09 +0200 Message-ID: <159311592933.207748.4033228977231895526.stgit@toke.dk> In-Reply-To: <159311592607.207748.5904268231642411759.stgit@toke.dk> References: <159311592607.207748.5904268231642411759.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 3/3] 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 20:12:17 -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. Fixes: 046f6fd5daef ("sched: Add Common Applications Kept Enhanced (cake) qdisc") 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 094d6e652deb..ca813697728e 100644 --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c @@ -2715,7 +2715,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; @@ -3032,7 +3032,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,