Merge pull request #3224 from blocktrron/upstream-master-updates

modules: update to latest HEAD

modules

@@ -2,14 +2,14 @@ GLUON_FEEDS='gluon packages routing'
 
 OPENWRT_REPO=https://github.com/openwrt/openwrt.git
 OPENWRT_BRANCH=openwrt-23.05
-OPENWRT_COMMIT=a527b34390f1cbe9b0bcffbc3b6e4e0059b0e251
+OPENWRT_COMMIT=1bbb94df9687e7376ca5f50c69f24aa15c704f85
 
 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
 PACKAGES_GLUON_COMMIT=3d08b0fee8dc5d96d8bcdb985fad1d5564de4022
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-23.05
-PACKAGES_PACKAGES_COMMIT=817246f59ff926ddf32e1de3fa0d50c1f92d8499
+PACKAGES_PACKAGES_COMMIT=229175a0bb3043b5ecbafc62d875122cca273881
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
 PACKAGES_ROUTING_BRANCH=openwrt-23.05

patches/openwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch

@@ -174,7 +174,7 @@ index 0000000000000000000000000000000000000000..077a563b6066cd1d3aee4b1e82328e8c
 + 
 + int system_bridge_addif(struct device *bridge, struct device *dev)
 diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
-index 214a1e6ecd83c067b96cb55ad052ae00b82fa8b5..bf6709ae2dbb87a21659558161d4882befd88b49 100644
+index aaffee332963db8e8afe72db6e21f39c4db9a8a4..d1139b9614df97a72a5da803e54d028f86b91544 100644
 --- a/target/linux/generic/config-5.15
 +++ b/target/linux/generic/config-5.15
 @@ -761,6 +761,7 @@ CONFIG_BRIDGE=y

targets/generic

@@ -41,6 +41,8 @@ config('ALL_NONSHARED', true)
 try_config('PACKAGE_usbip', false) -- fails to build
 try_config('PACKAGE_coova-chilli', false) -- fails to build
 try_config('PACKAGE_kmod-ipt-coova', false) -- fails to build
+try_config('PACKAGE_libpfring', false) -- fails to build
+try_config('PACKAGE_kmod-pf-ring', false) -- fails to build
 
 try_config('PACKAGE_ATH_DEBUG', true)