diff --git a/backports/0017-netifd-update-to-latest-HEAD.patch b/backports/0017-netifd-update-to-latest-HEAD.patch index 58cb71663..b8693dc44 100644 --- a/backports/0017-netifd-update-to-latest-HEAD.patch +++ b/backports/0017-netifd-update-to-latest-HEAD.patch @@ -1,16 +1,14 @@ -From c9e9ca475bc2eb90beb23a2c67c39389f8cb2527 Mon Sep 17 00:00:00 2001 +From 1496ca5ceb941ba725311c6c0366193092035f32 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 27 May 2021 13:24:47 +0200 -Subject: [PATCH 01/58] netifd: update to latest HEAD +Subject: [PATCH 01/60] netifd: update to latest HEAD Signed-off-by: John Crispin --- package/network/config/netifd/Makefile | 8 ++-- - .../netifd/patches/002-fix-dhcp-issue.patch | 17 +++++++++ .../config/netifd/patches/100-script.patch | 21 +++++++++++ .../config/netifd/patches/hairpin.patch | 37 +++++++++++++++++++ - 4 files changed, 78 insertions(+), 5 deletions(-) - create mode 100644 package/network/config/netifd/patches/002-fix-dhcp-issue.patch + 3 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 package/network/config/netifd/patches/100-script.patch create mode 100644 package/network/config/netifd/patches/hairpin.patch @@ -38,29 +36,6 @@ index 4b5f110da2..d41bddfd56 100644 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk -diff --git a/package/network/config/netifd/patches/002-fix-dhcp-issue.patch b/package/network/config/netifd/patches/002-fix-dhcp-issue.patch -new file mode 100644 -index 0000000000..6f1d2e708e ---- /dev/null -+++ b/package/network/config/netifd/patches/002-fix-dhcp-issue.patch -@@ -0,0 +1,17 @@ -+Index: netifd-2019-08-05-5e02f944/interface.c -+=================================================================== -+--- netifd-2019-08-05-5e02f944.orig/interface.c -++++ netifd-2019-08-05-5e02f944/interface.c -+@@ -424,7 +424,11 @@ interface_main_dev_cb(struct device_user -+ interface_set_link_state(iface, false); -+ break; -+ case DEV_EVENT_TOPO_CHANGE: -+- interface_proto_event(iface->proto, PROTO_CMD_RENEW, false); -++ /* This renews the dhcp lease when the bridge adds/deletes a -++ * new interface. It causes some dhcp servers to fail in -++ * case where there are many interfaces being added to the -++ * bridge frequently. Disabling this for now. */ -++ /* interface_proto_event(iface->proto, PROTO_CMD_RENEW, false); */ -+ return; -+ default: -+ break; diff --git a/package/network/config/netifd/patches/100-script.patch b/package/network/config/netifd/patches/100-script.patch new file mode 100644 index 0000000000..e7ba83f4bb