diff --git a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter index 2da98a241..f00ff30e6 100755 --- a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter +++ b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter @@ -9,12 +9,21 @@ omr_intf_del() { } omr_intf_set() { config_get multipath "$1" multipath + [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep raspberry)" ] && [ -n "$(echo $iface | grep usb)" ] && { + uci -q set openmptcprouter.settings.scaling_min_freq=$(uci -q get openmptcprouter.settings.scaling_max_freq) + } [ -z "$multipath" ] || [ "$multipath" = "off" ] && return uci -q set openmptcprouter.$1=interface } start_service() { local scaling_min_freq scaling_max_freq + + config_load openmptcprouter + config_foreach omr_intf_del interface + config_load network + config_foreach omr_intf_set interface + config_load openmptcprouter config_get scaling_min_freq settings scaling_min_freq [ -n "$scaling_min_freq" ] && { @@ -37,10 +46,6 @@ start_service() { # remove sysctl already defined in /etc/sysctl.d/ sed -i -e '/tcp_fin_timeout/d' -e '/tcp_keepalive_time/d' -e '/nf_conntrack_max/d' /etc/sysctl.conf sed -i -e '/tcp_fin_timeout/d' -e '/tcp_keepalive_time/d' -e '/nf_conntrack_max/d' /etc/sysctl.d/10-default.conf - - config_foreach omr_intf_del interface - config_load network - config_foreach omr_intf_set interface } reload_service() { diff --git a/mptcp/files/etc/init.d/mptcp b/mptcp/files/etc/init.d/mptcp index c69c5d317..ab07610ec 100755 --- a/mptcp/files/etc/init.d/mptcp +++ b/mptcp/files/etc/init.d/mptcp @@ -42,11 +42,6 @@ interface_multipath_settings() { config_get iface "$config" ifname [ -z "$iface" ] && iface=$(ifstatus "$config" | jsonfilter -q -e '@["l3_device"]') - # Force scaling freq for RPI if USB is connected - [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep raspberry)" ] && [ -n "$(echo $iface | grep usb)" ] && { - uci -q set openmptcprouter.settings.scaling_min_freq=$(uci -q get openmptcprouter.settings.scaling_max_freq) - } - [ "$enabled" = "0" ] && return 0 count=$(($count+1))