Fixes openwrt/packages#10451 Supersedes openwrt/packages#10461 Signed-off-by: Rosen Penev <rosenp@gmail.com> (use separate upstreamed patches) Ref: https://github.com/openwrt/packages/pull/10461 Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>