🐶 Sync 2026-09-19 14:31:07
Merge-upstream / merge (push) Canceled after 0s

This commit is contained in:
github-actions[bot] committed 2026-09-19 14:31:07 +08:00
1 parent 6e51a3a7b7
commit 098be7c20c
2 files changed
+10 -22

No files matched your search

+1 -1
View File
@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=netifd PKG_NAME:=netifd
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
@@ -1,23 +1,11 @@
From a349ea7c5f73513808ea266b823e915344d9bc69 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Fri, 18 Sep 2026 06:05:11 +0800
Subject: [PATCH] Update proto.c
Signed-off-by: kiddin9 <48883331+kiddin9@users.noreply.github.com>
---
proto.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/proto.c b/proto.c
index c338ff27..6c93127c 100644
--- a/proto.c --- a/proto.c
+++ b/proto.c +++ b/proto.c
@@ -413,7 +413,7 @@ proto_apply_static_ip_settings(struct interface *iface, struct blob_attr *attr) @@ -426,6 +426,8 @@ proto_apply_static_ip_settings(struct interface *iface, struct blob_attr *attr)
struct blob_attr *tb[__OPT_MAX]; error = "INVALID_NETMASK";
struct blob_attr *cur; goto error;
const char *error; }
- unsigned int netmask = 32; + } else if (!strcmp(iface->name, "lan")) {
+ unsigned int netmask = 24; + netmask = 24;
bool ip6deprecated; }
int n_v4 = 0, n_v6 = 0;
struct in_addr bcast = {0,}, ptp = {0,}; if ((cur = tb[OPT_BROADCAST])) {