Skip to content
Snippets Groups Projects
Unverified Commit 603a08af authored by Andreas Ziegler's avatar Andreas Ziegler Committed by GitHub
Browse files

Merge pull request #3340 from herbetom/main-updates

modules: update to latest Git HEAD
parents 52a15803 54c51d4c
No related branches found
Tags experimental-2024-09-25-base
No related merge requests found
...@@ -2,14 +2,14 @@ GLUON_FEEDS='gluon packages routing' ...@@ -2,14 +2,14 @@ GLUON_FEEDS='gluon packages routing'
OPENWRT_REPO=https://github.com/openwrt/openwrt.git OPENWRT_REPO=https://github.com/openwrt/openwrt.git
OPENWRT_BRANCH=openwrt-23.05 OPENWRT_BRANCH=openwrt-23.05
OPENWRT_COMMIT=7447eeac91d36f2e67e7da55310676ed7fe0a36d OPENWRT_COMMIT=dced292d680d79afd18f65ed6d930a48d5b8551b
PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
PACKAGES_GLUON_COMMIT=3d08b0fee8dc5d96d8bcdb985fad1d5564de4022 PACKAGES_GLUON_COMMIT=3d08b0fee8dc5d96d8bcdb985fad1d5564de4022
PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
PACKAGES_PACKAGES_BRANCH=openwrt-23.05 PACKAGES_PACKAGES_BRANCH=openwrt-23.05
PACKAGES_PACKAGES_COMMIT=b05da090547df99390f6fcbee51f2273f26a5c24 PACKAGES_PACKAGES_COMMIT=b5ed85f6e94aa08de1433272dc007550f4a28201
PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
PACKAGES_ROUTING_BRANCH=openwrt-23.05 PACKAGES_ROUTING_BRANCH=openwrt-23.05
......
...@@ -174,10 +174,10 @@ index 0000000000000000000000000000000000000000..077a563b6066cd1d3aee4b1e82328e8c ...@@ -174,10 +174,10 @@ index 0000000000000000000000000000000000000000..077a563b6066cd1d3aee4b1e82328e8c
+ +
+ int system_bridge_addif(struct device *bridge, struct device *dev) + 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 diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
index 377553433846b5cec34e5d7036b8109f954aef5a..47c2ca0409654b4bfa08f32ed2869a6d077c8913 100644 index 4b059cb53f4fe1b7132675d15b66a175a0d44a60..ed36acdb8dc055bef60709191ad0950520f9cb57 100644
--- a/target/linux/generic/config-5.15 --- a/target/linux/generic/config-5.15
+++ b/target/linux/generic/config-5.15 +++ b/target/linux/generic/config-5.15
@@ -761,6 +761,7 @@ CONFIG_BRIDGE=y @@ -762,6 +762,7 @@ CONFIG_BRIDGE=y
# CONFIG_BRIDGE_EBT_T_NAT is not set # CONFIG_BRIDGE_EBT_T_NAT is not set
# CONFIG_BRIDGE_EBT_VLAN is not set # CONFIG_BRIDGE_EBT_VLAN is not set
CONFIG_BRIDGE_IGMP_SNOOPING=y CONFIG_BRIDGE_IGMP_SNOOPING=y
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment