[v2,4/7] bsp/default: remove obsolete qos

Submitted by Tim Niemeyer on June 10, 2016, 9:58 p.m.

Details

Message ID 1465595895-2059-5-git-send-email-tim@tn-x.org
State Accepted, archived
Headers show

Commit Message

Tim Niemeyer June 10, 2016, 9:58 p.m.
qos is now done by fff-web via simple-tc.

Signed-off-by: Tim Niemeyer <tim@tn-x.org>
---

Changes in v2: None

 bsp/default/root_file_system/etc/config/qos   | 84 ---------------------------
 bsp/default/root_file_system/etc/rc.local.tpl |  3 -
 2 files changed, 87 deletions(-)
 delete mode 100644 bsp/default/root_file_system/etc/config/qos

Patch hide | download patch | download mbox

diff --git a/bsp/default/root_file_system/etc/config/qos b/bsp/default/root_file_system/etc/config/qos
deleted file mode 100644
index f9b4128..0000000
--- a/bsp/default/root_file_system/etc/config/qos
+++ /dev/null
@@ -1,84 +0,0 @@ 
-# QoS configuration for OpenWrt
-
-# INTERFACES:
-config interface wan
-	option classgroup  "Default"
-	option enabled      1
-	option overhead     1
-	option upload       128
-	option download     1024
-
-# RULES:
-config classify
-	option target       "Bulk"
-	option layer7       "edonkey"
-config classify
-	option target       "Bulk"
-	option layer7       "bittorrent"
-config classify
-	option target       "Priority"
-	option ports        "22,53"
-config classify
-	option target       "Normal"
-	option proto        "tcp"
-	option ports        "20,21,25,80,110,443,993,995"
-config classify
-	option target       "Express"
-	option ports        "5190"
-config default
-	option target       "Express"
-	option proto        "udp"
-	option pktsize      "-500"
-config reclassify
-	option target       "Priority"
-	option proto        "icmp"
-config default
-	option target       "Bulk"
-	option portrange    "1024-65535"
-config reclassify
-	option target       "Priority"
-	option proto        "tcp"
-	option pktsize      "-128"
-	option mark         "!Bulk"
-	option tcpflags     "SYN"
-config reclassify
-	option target       "Priority"
-	option proto        "tcp"
-	option pktsize      "-128"
-	option mark	        "!Bulk"
-	option tcpflags     "ACK"
-
-# Don't change the stuff below unless you
-# really know what it means :)
-
-config classgroup "Default"
-	option classes      "Priority Express Normal Bulk"
-	option default      "Normal"
-
-config class "Priority"
-	option packetsize  400
-	option maxsize     400
-	option avgrate     10
-	option priority    20
-config class "Priority_down"
-	option packetsize  1000
-	option avgrate     10
-
-
-config class "Express"
-	option packetsize  1000
-	option maxsize     800
-	option avgrate     50
-	option priority    10
-
-config class "Normal"
-	option packetsize  1500
-	option packetdelay 100
-	option avgrate     10
-	option priority    5
-config class "Normal_down"
-	option avgrate     20
-
-config class "Bulk"
-	option avgrate     1
-	option packetdelay 200
\ No newline at end of file
diff --git a/bsp/default/root_file_system/etc/rc.local.tpl b/bsp/default/root_file_system/etc/rc.local.tpl
index 754affb..f3abb05 100755
--- a/bsp/default/root_file_system/etc/rc.local.tpl
+++ b/bsp/default/root_file_system/etc/rc.local.tpl
@@ -7,9 +7,6 @@ 
 # Starting NTP-Client Daemon after 30s to ensure that the interface is up
 ( sleep 30 ; ntpd -p ${NTPD_IP} ) &
 
-/etc/init.d/qos disable
-/etc/init.d/qos stop
-
 touch /tmp/started
 
 exit 0

Comments

Tobias Klaus June 11, 2016, 9:56 a.m.
Reviewed-by: Tobias Klaus <tk+ff@meskal.net>

Am Freitag, 10. Juni 2016, 23:58:12 CEST schrieb Tim Niemeyer:
> qos is now done by fff-web via simple-tc.
> 
> Signed-off-by: Tim Niemeyer <tim@tn-x.org>
> ---
> 
> Changes in v2: None
> 
>  bsp/default/root_file_system/etc/config/qos   | 84
> --------------------------- bsp/default/root_file_system/etc/rc.local.tpl |
>  3 -
>  2 files changed, 87 deletions(-)
>  delete mode 100644 bsp/default/root_file_system/etc/config/qos
> 
> diff --git a/bsp/default/root_file_system/etc/config/qos
> b/bsp/default/root_file_system/etc/config/qos deleted file mode 100644
> index f9b4128..0000000
> --- a/bsp/default/root_file_system/etc/config/qos
> +++ /dev/null
> @@ -1,84 +0,0 @@
> -# QoS configuration for OpenWrt
> -
> -# INTERFACES:
> -config interface wan
> -	option classgroup  "Default"
> -	option enabled      1
> -	option overhead     1
> -	option upload       128
> -	option download     1024
> -
> -# RULES:
> -config classify
> -	option target       "Bulk"
> -	option layer7       "edonkey"
> -config classify
> -	option target       "Bulk"
> -	option layer7       "bittorrent"
> -config classify
> -	option target       "Priority"
> -	option ports        "22,53"
> -config classify
> -	option target       "Normal"
> -	option proto        "tcp"
> -	option ports        "20,21,25,80,110,443,993,995"
> -config classify
> -	option target       "Express"
> -	option ports        "5190"
> -config default
> -	option target       "Express"
> -	option proto        "udp"
> -	option pktsize      "-500"
> -config reclassify
> -	option target       "Priority"
> -	option proto        "icmp"
> -config default
> -	option target       "Bulk"
> -	option portrange    "1024-65535"
> -config reclassify
> -	option target       "Priority"
> -	option proto        "tcp"
> -	option pktsize      "-128"
> -	option mark         "!Bulk"
> -	option tcpflags     "SYN"
> -config reclassify
> -	option target       "Priority"
> -	option proto        "tcp"
> -	option pktsize      "-128"
> -	option mark	        "!Bulk"
> -	option tcpflags     "ACK"
> -
> -# Don't change the stuff below unless you
> -# really know what it means :)
> -
> -config classgroup "Default"
> -	option classes      "Priority Express Normal Bulk"
> -	option default      "Normal"
> -
> -config class "Priority"
> -	option packetsize  400
> -	option maxsize     400
> -	option avgrate     10
> -	option priority    20
> -config class "Priority_down"
> -	option packetsize  1000
> -	option avgrate     10
> -
> -
> -config class "Express"
> -	option packetsize  1000
> -	option maxsize     800
> -	option avgrate     50
> -	option priority    10
> -
> -config class "Normal"
> -	option packetsize  1500
> -	option packetdelay 100
> -	option avgrate     10
> -	option priority    5
> -config class "Normal_down"
> -	option avgrate     20
> -
> -config class "Bulk"
> -	option avgrate     1
> -	option packetdelay 200
> \ No newline at end of file
> diff --git a/bsp/default/root_file_system/etc/rc.local.tpl
> b/bsp/default/root_file_system/etc/rc.local.tpl index 754affb..f3abb05
> 100755
> --- a/bsp/default/root_file_system/etc/rc.local.tpl
> +++ b/bsp/default/root_file_system/etc/rc.local.tpl
> @@ -7,9 +7,6 @@
>  # Starting NTP-Client Daemon after 30s to ensure that the interface is up
>  ( sleep 30 ; ntpd -p ${NTPD_IP} ) &
> 
> -/etc/init.d/qos disable
> -/etc/init.d/qos stop
> -
>  touch /tmp/started
> 
>  exit 0