diff --git a/netifd/Makefile b/netifd/Makefile index 808432756..826889aca 100644 --- a/netifd/Makefile +++ b/netifd/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netifd -PKG_RELEASE:=3 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git -PKG_SOURCE_DATE:=2023-08-31 -PKG_SOURCE_VERSION:=1a07f1dff32b3af49e39533e33e8964b59535662 -PKG_MIRROR_HASH:=dc621dd04c3c9631002f929cf10a4620f57af8b0baf614c590bda17957fa6201 +PKG_SOURCE_DATE:=2023-11-10 +PKG_SOURCE_VERSION:=35facc8306f590a7330789ab6d5785c0d43073ef +PKG_MIRROR_HASH:=4f73591ae1873e18df235349e478f2196ca0d3123c313a04149dc9d5e2bfb403 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0 diff --git a/netifd/files/lib/netifd/dhcp.script b/netifd/files/lib/netifd/dhcp.script index 02a95dd76..053dd75b6 100755 --- a/netifd/files/lib/netifd/dhcp.script +++ b/netifd/files/lib/netifd/dhcp.script @@ -19,12 +19,13 @@ setup_interface() { # TODO: apply $broadcast local ip_net - eval "$(ipcalc.sh "$ip/$mask")";ip_net="$NETWORK" + local ip_net IP PREFIX NETWORK NETMASK BROADCAST + ipcalc "$ip/$mask" && ip_net="$NETWORK" local i for i in $router; do local gw_net - eval "$(ipcalc.sh "$i/$mask")";gw_net="$NETWORK" + ipcalc "$i/$mask" && gw_net="$NETWORK" [ "$ip_net" != "$gw_net" ] && proto_add_ipv4_route "$i" 32 "" "$ip" #[ "$DEFAULTROUTE" = 0 ] || proto_add_ipv4_route 0.0.0.0 0 "$i" "$ip" diff --git a/netifd/patches/001-init-pause.patch b/netifd/patches/001-init-pause.patch deleted file mode 100644 index 0c09aab73..000000000 --- a/netifd/patches/001-init-pause.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/system-linux.c 2023-09-13 10:44:22.163111635 +0200 -+++ b/system-linux.c 2023-09-13 10:44:47.562696256 +0200 -@@ -2720,7 +2720,9 @@ - system_if_dump_info(struct device *dev, struct blob_buf *b) - { - __u32 *supported, *advertising, *lp_advertising; -- bool rx_pause, tx_pause, pause_autoneg; -+ bool rx_pause = false; -+ bool tx_pause = false; -+ bool pause_autoneg = false; - struct { - struct ethtool_link_settings req; - __u32 link_mode_data[3 * 127];