[openwrt/openwrt] mediatek: fix IPv4-only corner case and commit in 99-net-ps

LEDE Commits lede-commits at lists.infradead.org
Sun Jun 28 08:38:52 EDT 2020


adrian pushed a commit to openwrt/openwrt.git, branch openwrt-19.07:
https://git.openwrt.org/670eeb788801db8c3ed2843be357bb77a3aa5c5f

commit 670eeb788801db8c3ed2843be357bb77a3aa5c5f
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Tue Jun 16 14:46:42 2020 +0200

    mediatek: fix IPv4-only corner case and commit in 99-net-ps
    
    The uci config section network.globals set up in /bin/config_generate
    will only be created if /proc/sys/net/ipv6 exists.
    
    Correspondingly, lacking IPv6 support, the command
    uci set network.globals.packet_steering=1
    will fail with "uci: Invalid argument" as the network.globals config
    has not been set up.
    
    Fix that by adding the setup there as well.
    
    While at it, limit the uci commit to the network config file.
    
    Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
    (cherry picked from commit 636b62e8e232951154ac4ccd7972fda3f8de0379)
---
 target/linux/mediatek/base-files/etc/uci-defaults/99-net-ps | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/target/linux/mediatek/base-files/etc/uci-defaults/99-net-ps b/target/linux/mediatek/base-files/etc/uci-defaults/99-net-ps
index 9267340317..bfcd85a307 100755
--- a/target/linux/mediatek/base-files/etc/uci-defaults/99-net-ps
+++ b/target/linux/mediatek/base-files/etc/uci-defaults/99-net-ps
@@ -1,3 +1,4 @@
+uci set network.globals='globals'
 uci set network.globals.default_rps_val=14
 uci set network.globals.default_rps_flow_cnt=256
 uci set network.globals.default_xps_val=14
@@ -12,5 +13,7 @@ uci set network.lan2=device
 uci set network.lan2.name=lan2
 uci set network.lan3=device
 uci set network.lan3.name=lan3
-uci commit
+
+uci commit network
+
 exit 0



More information about the lede-commits mailing list