From nobody Mon Feb 13 18:34:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PFtKk6rRrz3pgkN; Mon, 13 Feb 2023 18:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PFtKk6Kbdz41tQ; Mon, 13 Feb 2023 18:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676313274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cqwuzh8jSKuYvVQYga5bhi481D4/tze0UDrp0xVElJk=; b=bwhnaxGWvCHuh3OK/R9WeQvqbzNjA1HguNC0Oy5Kwy5wQwSKt6PfyeBO6h0qsGqljLMvoh 6fSe2zhRgg5OlMhYVs5PtWqbditn1YHawPPMQFAxcQeqErytKyooqHGye24c6ueVKr5C4V aEN3uS55q/cxnrj8vC5IEwcPJTPEQND6eewh6HpmedQSdy39Hyt4mGoNuEEDOn2hJdpFUG b8M0qfPEs+WIFWLAAuyXJ0xorlkG2J7JXeSqSY3xi5dZOT0CsrHeH4FuPs5hXIlKcYmqQG PdYXmXqb3gHUQZWYJgCC3LM/Kk/YO1NQ7fpLUBtBaRppxwI4zuWpGe/ggcOkqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676313274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cqwuzh8jSKuYvVQYga5bhi481D4/tze0UDrp0xVElJk=; b=TcbEqxEAxkZn2FvUAMNlLZ/NDMAWo2r/rSOuyMMF7owMXZivyXwEtgQd8p/QYjy1I7HJTu Cod7IrOpgR0UmY0ItCEh+6+j2Fcjg8GJbKlZ19jvfopee2o34rDO1nUO/H6nIYovNYUXMY zT0g4iPRK6eByBXqcCtbo+1RIr0FLce90loxvE6Z08zoVL9zEaNWWiqHo/C+2h4fwcJrmA VDbEuXCukKR0vVu2ajdZY9Z16xQJXOwh8TymuUXT5s/nLdNDQF6wI8KzcP29+KSgqsRjTQ xDc2nx0K4Tell+qlx5D1i8O/HCmmg387MwIkWDDPkd+BAyiX32tUY346jO2X7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676313274; a=rsa-sha256; cv=none; b=IqC55M0Y3/pZZEBpNFlirlj1DYz15tA6gcTMywqrUICax9/BHBqycyk2YLzmnPws8N9OoC 1xqhpT5Bu86d46XetkPXI9/AXzNu9kg5ZxdQudKRrzBRbHjUU9nl/1IdP1wC9jd2rjs1wu PBg5dEEQQ1gThciYepQROODP9m9zjssLLEkS6mLZm9OqEZ/UD8p5iwbzqK3ZrhUcPl6XBk CXa9owjQFwfSAxfSJVEzbb0FzfYgs2SEi5BOP5DjM5ZwGKfw+2p5IRJodfwRVudH+81izt dQOR4svzup8qlt2yTu39OphEpR8iu3v7t0/cdgwuXKJe8gS6RH9cXxAi/t9+MQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PFtKk5HYMzSxx; Mon, 13 Feb 2023 18:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31DIYYn8040145; Mon, 13 Feb 2023 18:34:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31DIYYou040144; Mon, 13 Feb 2023 18:34:34 GMT (envelope-from git) Date: Mon, 13 Feb 2023 18:34:34 GMT Message-Id: <202302131834.31DIYYou040144@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: c492eb60b303 - main - altq: ansify List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c492eb60b30328035129a11c222aaded4d499b44 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=c492eb60b30328035129a11c222aaded4d499b44 commit c492eb60b30328035129a11c222aaded4d499b44 Author: Mateusz Guzik AuthorDate: 2023-02-13 18:32:45 +0000 Commit: Mateusz Guzik CommitDate: 2023-02-13 18:32:45 +0000 altq: ansify Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/altq/altq_priq.c | 3 +-- sys/net/altq/altq_red.c | 4 +--- sys/net/altq/altq_subr.c | 43 +++++++++++++------------------------------ 3 files changed, 15 insertions(+), 35 deletions(-) diff --git a/sys/net/altq/altq_priq.c b/sys/net/altq/altq_priq.c index bb679baa236d..6d26116a601b 100644 --- a/sys/net/altq/altq_priq.c +++ b/sys/net/altq/altq_priq.c @@ -575,8 +575,7 @@ priq_getq(struct priq_class *cl) } static struct mbuf * -priq_pollq(cl) - struct priq_class *cl; +priq_pollq(struct priq_class *cl) { return qhead(cl->cl_q); } diff --git a/sys/net/altq/altq_red.c b/sys/net/altq/altq_red.c index cd180f4fca2f..e6fc423f48b9 100644 --- a/sys/net/altq/altq_red.c +++ b/sys/net/altq/altq_red.c @@ -523,9 +523,7 @@ mark_ecn(struct mbuf *m, struct altq_pktattr *pktattr, int flags) } struct mbuf * -red_getq(rp, q) - red_t *rp; - class_queue_t *q; +red_getq(red_t *rp, class_queue_t *q) { struct mbuf *m; diff --git a/sys/net/altq/altq_subr.c b/sys/net/altq/altq_subr.c index d569aa3f3ab3..c8b98beaba07 100644 --- a/sys/net/altq/altq_subr.c +++ b/sys/net/altq/altq_subr.c @@ -148,9 +148,7 @@ ALTQ_FEATURE(fairq, "ALTQ Fair Queuing discipline"); /* look up the queue state by the interface name and the queueing type. */ void * -altq_lookup(name, type) - char *name; - int type; +altq_lookup(char *name, int type) { struct ifnet *ifp; @@ -164,13 +162,10 @@ altq_lookup(name, type) } int -altq_attach(ifq, type, discipline, enqueue, dequeue, request) - struct ifaltq *ifq; - int type; - void *discipline; - int (*enqueue)(struct ifaltq *, struct mbuf *, struct altq_pktattr *); - struct mbuf *(*dequeue)(struct ifaltq *, int); - int (*request)(struct ifaltq *, int, void *); +altq_attach(struct ifaltq *ifq, int type, void *discipline, + int (*enqueue)(struct ifaltq *, struct mbuf *, struct altq_pktattr *), + struct mbuf *(*dequeue)(struct ifaltq *, int), + int (*request)(struct ifaltq *, int, void *)) { IFQ_LOCK(ifq); if (!ALTQ_IS_READY(ifq)) { @@ -189,8 +184,7 @@ altq_attach(ifq, type, discipline, enqueue, dequeue, request) } int -altq_detach(ifq) - struct ifaltq *ifq; +altq_detach(struct ifaltq *ifq) { IFQ_LOCK(ifq); @@ -219,8 +213,7 @@ altq_detach(ifq) } int -altq_enable(ifq) - struct ifaltq *ifq; +altq_enable(struct ifaltq *ifq) { int s; @@ -247,8 +240,7 @@ altq_enable(ifq) } int -altq_disable(ifq) - struct ifaltq *ifq; +altq_disable(struct ifaltq *ifq) { int s; @@ -270,9 +262,7 @@ altq_disable(ifq) #ifdef ALTQ_DEBUG void -altq_assert(file, line, failedexpr) - const char *file, *failedexpr; - int line; +altq_assert(const char *file, int line, const char *failedexpr) { (void)printf("altq assertion \"%s\" failed: file \"%s\", line %d\n", failedexpr, file, line); @@ -293,9 +283,7 @@ altq_assert(file, line, failedexpr) #define TBR_UNSCALE(x) ((x) >> TBR_SHIFT) static struct mbuf * -tbr_dequeue(ifq, op) - struct ifaltq *ifq; - int op; +tbr_dequeue(struct ifaltq *ifq, int op) { struct tb_regulator *tbr; struct mbuf *m; @@ -345,9 +333,7 @@ tbr_dequeue(ifq, op) * if the specified rate is zero, the token bucket regulator is deleted. */ int -tbr_set(ifq, profile) - struct ifaltq *ifq; - struct tb_profile *profile; +tbr_set(struct ifaltq *ifq, struct tb_profile *profile) { struct tb_regulator *tbr, *otbr; @@ -425,8 +411,7 @@ tbr_set(ifq, profile) * MPSAFE */ static void -tbr_timeout(arg) - void *arg; +tbr_timeout(void *arg) { VNET_ITERATOR_DECL(vnet_iter); struct ifnet *ifp; @@ -754,9 +739,7 @@ altq_getqstats(struct pf_altq *a, void *ubuf, int *nbytes, int version) * read and write diffserv field in IPv4 or IPv6 header */ u_int8_t -read_dsfield(m, pktattr) - struct mbuf *m; - struct altq_pktattr *pktattr; +read_dsfield(struct mbuf *m, struct altq_pktattr *pktattr) { struct mbuf *m0; u_int8_t ds_field = 0;