From patchwork Mon Oct 14 16:46:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2518 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 46sPbd2sY8z42jJ for ; Mon, 14 Oct 2019 16:46:53 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 46sPbQ1bY1z3dt; Mon, 14 Oct 2019 16:46:42 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 46sPbP6gHPz2y2r; Mon, 14 Oct 2019 16:46:41 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 46sPbH0VMRz2yr9 for ; Mon, 14 Oct 2019 16:46:35 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 46sPbG6Rcgz2lQ; Mon, 14 Oct 2019 16:46:34 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1571071594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jDXuYLXCZlT7A2P5J6875eaz6U2hj+kAP7IAEKIksfo=; b=RPbYbNGKHFaMkduz86GT3RhibroFDlCpNFHlcxnauJxiZDbCLwI1QQf4uZK/S4fcgR4FGD BdhcPcoclvO5eTDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1571071594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jDXuYLXCZlT7A2P5J6875eaz6U2hj+kAP7IAEKIksfo=; b=YBNBNcn1nLo/Qg2j5pVqHdEPGkNuVdm+HnJn662+159q1z7QE6gQqqq/1WGY/kl+UEAeva h3NW5l487d2zQswlSUSkue2wUe8HsW3+fPqh9mukxru9dxbgAzF+Qqtj3uzUguPZx+iOhR CPFvY3tJFtLtBhpRkxAI1bTxXjpVbKEfsY4FNPJn/ZBVORG/kGw88TUPmcmgYV8mnyx0/n 2NClB6W5Bp1jfpa7Y9NN5tOP5lY43nlr68pdjnSICO4ucAvGMDHOdH++nKYZwhXiabhz7k 3nX1TDLqds7nSLNOCxBtw5lhNl8PV+zhjDHe3j84ksgXI148j7qQBkOUgLdDZw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 15/17] QoS: Drop support for setting TOS bits per class Date: Mon, 14 Oct 2019 16:46:25 +0000 Message-Id: <20191014164627.18516-15-michael.tremer@ipfire.org> In-Reply-To: <20191014164627.18516-1-michael.tremer@ipfire.org> References: <20191014164627.18516-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is useless since no ISP will evaluate those settings any more and it has a rather large impact on throughput. Signed-off-by: Michael Tremer --- config/qos/makeqosscripts.pl | 24 ------------------------ html/cgi-bin/qos.cgi | 12 ------------ 2 files changed, 36 deletions(-) diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index 9a57aad28..4f66b20b4 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -128,7 +128,6 @@ case "\$1" in echo "[iptables]" iptables -t mangle -n -L QOS-OUT -v -x 2> /dev/null iptables -t mangle -n -L QOS-INC -v -x 2> /dev/null - iptables -t mangle -n -L QOS-TOS -v -x 2> /dev/null exit 0 ;; esac @@ -191,9 +190,7 @@ print </dev/null 2>&1 /usr/local/bin/qosd $qossettings{'IMQ_DEV'} >/dev/null 2>&1 @@ -553,15 +533,11 @@ print </dev/null 2>&1 - iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1 iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC >/dev/null 2>&1 - iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1 iptables -t mangle --flush QOS-OUT >/dev/null 2>&1 iptables -t mangle --delete-chain QOS-OUT >/dev/null 2>&1 iptables -t mangle --flush QOS-INC >/dev/null 2>&1 iptables -t mangle --delete-chain QOS-INC >/dev/null 2>&1 - iptables -t mangle --flush QOS-TOS >/dev/null 2>&1 - iptables -t mangle --delete-chain QOS-TOS >/dev/null 2>&1 rmmod sch_htb >/dev/null 2>&1 diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 320eef67d..8211a3ca0 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -883,18 +883,6 @@ END Ceilburst:   -END -; - $selected{'TOS'}{$qossettings{'TOS'}} = "selected='selected'"; -print <TOS-Bit: - -   $Lang::tr{'remark'}: * $Lang::tr{'required field'}