Merge pull request #2753 from AiyionPrime/master-updates

master updates
This commit is contained in:
Andreas Ziegler 2023-01-08 15:58:01 +01:00 committed by GitHub
commit c60ada47fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -2,15 +2,15 @@ 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=6c3e16055ae5d79205812e8436110fd862266c94 OPENWRT_COMMIT=4b7f9e42e2bff91d8eec2f195d0bb3bb6f6c43e2
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=91312dbde702c652be531b95cbfe7976d1edb79e PACKAGES_PACKAGES_COMMIT=4b30c97b57aa158cbb70190d0aab8bb472875b6a
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
PACKAGES_ROUTING_COMMIT=0fb5e3c1a3520003e689f9c9be695f8c7a9bacaa PACKAGES_ROUTING_COMMIT=1a87333f268bcf0a11e3a665a357cb0d4ec2d680
PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
PACKAGES_GLUON_COMMIT=04d2b6ffbb6ee02012f2733b7752d8db0d12eaff PACKAGES_GLUON_COMMIT=04d2b6ffbb6ee02012f2733b7752d8db0d12eaff

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 efc0861f1c99eedb29d40ea0e6f52a26008c901b..a99c836e2f9413936f010ef53f1f3d3c82d46dff 100644 index 4a17e635b2b4ff62e362c1815723aeaf30b1b443..9b11be8fcd59836a0c6351babae78343658a80f2 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
@@ -737,6 +737,7 @@ CONFIG_BRIDGE=y @@ -738,6 +738,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