scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-10-29 01:22:25 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

netifd: update to latest HEAD

Browse Source 
fixes various STA issues

Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2023-11-15 11:21:21 +01:00
parent 009c003b48
commit d3c0df1a4f
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
patches/0020-netifd-fix-compile-on-older-kernels.patch
View File

@@ -1,7 +1,7 @@
From 5bc48fcccc56914a1231a4315852866831df33d5 Mon Sep 17 00:00:00 2001
From 146aff9ca0ed8795be76401e67ca21ce1ec01281 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Wed, 4 Aug 2021 08:36:30 +0200
Subject: [PATCH 20/43] netifd: fix compile on older kernels
Subject: [PATCH] netifd: fix compile on older kernels
The ethtool features do not exist on ancient qualcomm kernels.
Disable that feature if running on QCA.
@@ -14,16 +14,16 @@ Signed-off-by: John Crispin <john@phrozen.org>
diff --git a/package/network/config/netifd/patches/003-ethtool.patch b/package/network/config/netifd/patches/003-ethtool.patch
new file mode 100644
index 0000000000..6aee86283e
index 0000000000..74164cbe6e
--- /dev/null
+++ b/package/network/config/netifd/patches/003-ethtool.patch
@@ -0,0 +1,31 @@
+Index: netifd-2021-05-26-1eb0fafa/system-linux.c
+Index: netifd-2023-09-19-8587c074/system-linux.c
+===================================================================
+--- netifd-2021-05-26-1eb0fafa.orig/system-linux.c
++++ netifd-2021-05-26-1eb0fafa/system-linux.c
+@@ -1578,6 +1578,8 @@ int system_vlandev_del(struct device *vl
+ return system_link_del(vlandev->ifname);
+--- netifd-2023-09-19-8587c074.orig/system-linux.c
++++ netifd-2023-09-19-8587c074/system-linux.c
+@@ -2010,6 +2010,8 @@ system_set_ethtool_eee_settings(struct d
+ netifd_log_message(L_WARNING, "cannot set eee %d for device %s", s->eee, dev->ifname);
+ }
+
++#ifdef SPEED_400000
@@ -31,24 +31,24 @@ index 0000000000..6aee86283e
+ static void
+ system_set_ethtool_settings(struct device *dev, struct device_settings *s)
+ {
+@@ -1628,6 +1630,7 @@ system_set_ethtool_settings(struct devic
+ ecmd.cmd = ETHTOOL_SSET;
+@@ -2087,6 +2089,7 @@ system_set_ethtool_settings(struct devic
+ ecmd.req.cmd = ETHTOOL_SLINKSETTINGS;
+ ioctl(sock_ioctl, SIOCETHTOOL, &ifr);
+ }
++#endif
+
+ void
+ system_if_get_settings(struct device *dev, struct device_settings *s)
+@@ -1852,7 +1855,9 @@ system_if_apply_settings(struct device *
+ system_set_drop_unsolicited_na(dev, s->drop_unsolicited_na ? "1" : "0");
+ if (apply_mask & DEV_OPT_ARP_ACCEPT)
+ system_set_arp_accept(dev, s->arp_accept ? "1" : "0");
+ static void
+ system_set_ethtool_settings_after_up(struct device *dev, struct device_settings *s)
+@@ -2341,7 +2344,9 @@ system_if_apply_settings(struct device *
+ netifd_log_message(L_WARNING, "%s Your kernel is older than linux 6.1.0, changing DSA port conduit is not supported!", dev->ifname);
+ #endif
+ }
++#ifdef SPEED_400000
+ system_set_ethtool_settings(dev, s);
++#endif
+ }
+
+ int system_if_up(struct device *dev)
+ void system_if_apply_settings_after_up(struct device *dev, struct device_settings *s)
--
2.34.1

4
patches/0064-netifd-update-to-latest-HEAD.patch
View File

@@ -16,11 +16,11 @@ index e60e592098..4bcb570a49 100644
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
+PKG_MIRROR_HASH:=579a766a0aef46b4a60916166961bb725a77f8475d13fbd3c1580a5fc56ce0a0
+PKG_MIRROR_HASH:=b13e0c9d34fece8d349cc512a91103e997329ae263afb6f365a3d7cb34137a62
PKG_SOURCE_DATE:=2023-09-19
-PKG_SOURCE_VERSION:=7a58b995fdbecd9beed57e4d66d42cb3cf66aee2
-PKG_MIRROR_HASH:=a460a3b912047f8802eb24bb737084a08dad65b2dd520e5f5e7459379d1fcf8c
+PKG_SOURCE_VERSION:=40ed7363caf2b22b6e29ed9d9948189c2bc4c8f3
+PKG_SOURCE_VERSION:=8587c074f1eb2064c42adb0a6aa5073f695ab89d
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=GPL-2.0