Merge pull request #2691 from herbetom/master-updates

modules: update to latest HEAD
This commit is contained in:
David Bauer 2022-11-08 12:43:36 +01:00 committed by GitHub
commit da8eee86cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -2,11 +2,11 @@ GLUON_FEEDS='packages routing gluon'
OPENWRT_REPO=https://github.com/openwrt/openwrt.git OPENWRT_REPO=https://github.com/openwrt/openwrt.git
OPENWRT_BRANCH=openwrt-22.03 OPENWRT_BRANCH=openwrt-22.03
OPENWRT_COMMIT=00d7702796d922e4258b7acb6e6b88a93071eebe OPENWRT_COMMIT=e95b359eaab94f0626cebdf18938d5f8ccff5b22
PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
PACKAGES_PACKAGES_BRANCH=openwrt-22.03 PACKAGES_PACKAGES_BRANCH=openwrt-22.03
PACKAGES_PACKAGES_COMMIT=7132a6b55d645e25782f53c8ca2ce54c48112f0e PACKAGES_PACKAGES_COMMIT=c5974e7d166cf11200625c614e0f9de825dbaeb5
PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
PACKAGES_ROUTING_BRANCH=openwrt-22.03 PACKAGES_ROUTING_BRANCH=openwrt-22.03

View File

@ -208,10 +208,10 @@ index 0000000000000000000000000000000000000000..e3da684dc950ea4c226705d27b23b047
+ +
+ 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.10 b/target/linux/generic/config-5.10 diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10
index 6fa7394201375a44bc630db570e869e9b6d28743..ae1b22cb36f9a313bf76283b543ff8616ae7b85f 100644 index 5023b2f8108c4c68f8e875bb0a2977a0090f7b5e..b9d811fd563efe948c738c26a50672696d2e49c9 100644
--- a/target/linux/generic/config-5.10 --- a/target/linux/generic/config-5.10
+++ b/target/linux/generic/config-5.10 +++ b/target/linux/generic/config-5.10
@@ -736,6 +736,7 @@ CONFIG_BRIDGE=y @@ -737,6 +737,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