From nobody Wed Sep 07 10:03:59 2022 X-Original-To: dev-commits-src-main@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 4MMyWz2xsjz4c5KG; Wed, 7 Sep 2022 10:03:59 +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 4MMyWz2QFLz4MKy; Wed, 7 Sep 2022 10:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662545039; 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=GqdRTtE/KuZLBpoNP9ORljusoYFYdNhZfuHvdj+6FQI=; b=vdZa/elCw6T70MAp7IJYS4/FZJTDrZD/p43Eg/z2+wGekoaPVpocrexjyYW9WsBnNdciyw +AObUJoGpfnPWk8NzZvWTg0S1hSI2eD3rTBo7KyiBVjxbeWv5STtqueVGpXejm7W0/b0BI wKTZgXre19RDm9mWFro/f0zYlbDXo0CrfVX79Li5KVvzon3S8C5vJ+eLwbTPKUsFr6W2dB Tdu1Oiz8j2AwdjwhHjgOwqLgRXCtnaOr1kk9+b31v0ngj8kv96HFFsWndfWG/mLxaLaf8L 4OSQDjuF41R91EE9Cy6oryybwYDBy6ZuPr2mID2zNuBSF9s6JTCZY154kzHChA== 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 4MMyWz1RxWzV5s; Wed, 7 Sep 2022 10:03:59 +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 287A3xhR043898; Wed, 7 Sep 2022 10:03:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 287A3xbn043897; Wed, 7 Sep 2022 10:03:59 GMT (envelope-from git) Date: Wed, 7 Sep 2022 10:03:59 GMT Message-Id: <202209071003.287A3xbn043897@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: 223a73a1c4d1 - main - net: remove stale altq_input reference List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 223a73a1c4d102dd47399538625fb0fe0362f7d7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662545039; 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=GqdRTtE/KuZLBpoNP9ORljusoYFYdNhZfuHvdj+6FQI=; b=hPbv8g22v6IxePuoZ/2TWYHmjfNGlHGItLl+UDt9iX4kZh77UBvt86GTJBKOSU0SWAoKGU SQJbnyGAOfYWg2F36rSM93Gka+ft4SwjQ9LjTlNFnVMFLq4PXgdQfl8ajxRwra5lZyBQsq g9vOVr4ShQWoEIufI/y8hVghOr1jiECH6YPXpsUUVGzsaKAaMnAA6Cla6sXLI/h5wOI9tP 0pVf7Ldmzim5rnBOgegoDrkrcP5QLK34rltnfcVP5bQEklRJ9o/NhOLhPMPcNOA0O8OnWR +LvbPZSTTRFG4AwxJfyTLaONwaMTYAfeDEq+zdQjD7DRjaqsDHtKZDiGx1VgJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662545039; a=rsa-sha256; cv=none; b=b748XtCclKJ1RK3ae8VW3jB1JNCHFH+r6addpwB7GAreKjeUxtG6VEZ40jRT3e5lD61SVr 43+qkyOUr7DbHVaKkgnwSO2FA+pRps7okP/NYjZM64HIws1j+JyE2+sIKwq0exYLRXfZzi MOxGkWbUCi3NyKEZF6FOtRGAAQ9m2qbGSXy1PpT83swOATU757a4iA0jw6y8rX5kpVOC8i NRV3GpNTVwSI0pH9Hs8/GNPJiFrwc1M/PdnYsGuIwtSdSmJNRzAXAsx+6WEmtGE1SJQH1p tvdT5nc1etd+j/54RUTwF2lLDYGWAFLgDcCyq45M/VXAeCGD6q1eW8ezjBrdFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=223a73a1c4d102dd47399538625fb0fe0362f7d7 commit 223a73a1c4d102dd47399538625fb0fe0362f7d7 Author: Mateusz Guzik AuthorDate: 2022-09-06 18:12:54 +0000 Commit: Mateusz Guzik CommitDate: 2022-09-07 10:03:12 +0000 net: remove stale altq_input reference Code setting it was removed in: commit 325fab802e1f40c992141f945d0788c0edfdb1a4 Author: Eric van Gyzen Date: Tue Dec 4 23:46:43 2018 +0000 altq: remove ALTQ3_COMPAT code Reviewed by: glebius, kp Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D36471 --- sys/net/altq/altq_subr.c | 1 - sys/net/altq/if_altq.h | 1 - sys/netinet/ip_fastfwd.c | 8 -------- sys/netinet/ip_input.c | 6 ------ sys/netinet6/ip6_input.c | 6 ------ 5 files changed, 22 deletions(-) diff --git a/sys/net/altq/altq_subr.c b/sys/net/altq/altq_subr.c index 32999b694bcb..deadf4ecc9a9 100644 --- a/sys/net/altq/altq_subr.c +++ b/sys/net/altq/altq_subr.c @@ -78,7 +78,6 @@ * internal function prototypes */ static void tbr_timeout(void *); -int (*altq_input)(struct mbuf *, int) = NULL; static struct mbuf *tbr_dequeue(struct ifaltq *, int); static int tbr_timer = 0; /* token bucket regulator timer */ #if !defined(__FreeBSD__) || (__FreeBSD_version < 600000) diff --git a/sys/net/altq/if_altq.h b/sys/net/altq/if_altq.h index e0237ce77fda..ad7502c8ed49 100644 --- a/sys/net/altq/if_altq.h +++ b/sys/net/altq/if_altq.h @@ -169,7 +169,6 @@ extern int altq_detach(struct ifaltq *); extern int altq_enable(struct ifaltq *); extern int altq_disable(struct ifaltq *); extern struct mbuf *(*tbr_dequeue_ptr)(struct ifaltq *, int); -extern int (*altq_input)(struct mbuf *, int); #if 0 /* ALTQ3_CLFIER_COMPAT */ void altq_etherclassify(struct ifaltq *, struct mbuf *, struct altq_pktattr *); #endif diff --git a/sys/netinet/ip_fastfwd.c b/sys/netinet/ip_fastfwd.c index 95a601ced3ef..02a6be78d241 100644 --- a/sys/netinet/ip_fastfwd.c +++ b/sys/netinet/ip_fastfwd.c @@ -251,14 +251,6 @@ ip_tryforward(struct mbuf *m) M_ASSERTVALID(m); M_ASSERTPKTHDR(m); -#ifdef ALTQ - /* - * Is packet dropped by traffic conditioner? - */ - if (altq_input != NULL && (*altq_input)(m, AF_INET) == 0) - goto drop; -#endif - /* * Only IP packets without options */ diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 41ba82ea81dd..ead32d645acf 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -532,12 +532,6 @@ ip_input(struct mbuf *m) goto bad; } -#ifdef ALTQ - if (altq_input != NULL && (*altq_input)(m, AF_INET) == 0) - /* packet is dropped by traffic conditioner */ - return; -#endif - ip_len = ntohs(ip->ip_len); if (__predict_false(ip_len < hlen)) { IPSTAT_INC(ips_badlen); diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index fd184db1a985..70bacfb2436a 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -655,12 +655,6 @@ ip6_input(struct mbuf *m) in6_ifstat_inc(rcvif, ifs6_in_addrerr); goto bad; } -#ifdef ALTQ - if (altq_input != NULL && (*altq_input)(m, AF_INET6) == 0) { - /* packet is dropped by traffic conditioner */ - return; - } -#endif /* * The following check is not documented in specs. A malicious * party may be able to use IPv4 mapped addr to confuse tcp/udp stack