From 0380bae3f1b2b55d5d3131736a70a7c2308e96fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= <mps@arvanta.net>
Date: Thu, 14 Oct 2021 21:05:08 +0000
Subject: [PATCH] community/linux-edge: enable net bridge on riscv64

---
 community/linux-edge/APKBUILD            |  4 ++--
 community/linux-edge/config-edge.riscv64 | 23 ++++++++++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/community/linux-edge/APKBUILD b/community/linux-edge/APKBUILD
index 843a05d152ad..da1e48142808 100644
--- a/community/linux-edge/APKBUILD
+++ b/community/linux-edge/APKBUILD
@@ -9,7 +9,7 @@ case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux latest stable kernel"
 url="https://www.kernel.org"
 depends="mkinitfs"
@@ -228,7 +228,7 @@ bdb45eef1f02dcff1f28d2afa6f395181efa46d784e977dccd2f44f430d14c0fcf05e6c3e5ad7808
 1b68f9d134a0cebb5e941ca9d5062d5b47a298e9f71010297d854e4734d8f4a32a13ac3fc5187add384fb627a7e5392a6d5d881088794e9e16a52b6837d14e62  config-edge.aarch64
 cc90460230b355eeb52b184c6c26fd8ac023d90276da8ad2f7ed60b5e47b928a4041e47fbac004a7ec6a613ea4244d7f72426dbc103e524f442009b6fc082b31  config-edge.armv7
 02d7be40c10aca849bf39bd8918a3e99de741913def043c530507a07819ef58b30648b8bc1d50865e2f27ed7423e06b77e3e5430dbad0eb796f40f741be17e5f  config-edge.x86_64
-0f13943fd7a55fe279230649675371c2dd59d52b11b08879bebaf7857ef978b0fd9e1e65add36cbab576cf6153ca62eba545f7f54415a24f8feb25d825f82f78  config-edge.riscv64
+c53d8e9be62a8312732992dc182bae0252e61ac81da3661d60c5771237c5fad2bf5d291562db47bf09bff72de63a13712feca15075527911039dd9e4a3f62d2d  config-edge.riscv64
 751ac26d0150e11976cdd4cc3282ca24551c3430e421b958a33cd666fee73eab761d4f6b2b4733c13d979d665c20ee1b66e843da7d9d4198fb01a7e90b197e57  config-edge-virt.aarch64
 8539d122ec8e073f4c3c2f9aa198eab1e5a860315ad2564bc3ca00b86a14fbe0730c38f805cdf5338fe8248058109c66a43fef40f5617103a3c00235cbe3e1cd  config-edge-virt.armv7
 d94351461ad803b323431b134e65fa3706dba4bbe3342411a9d6689e20227afc43180ec900c9fd8b8b896a15a0e615412a5f78c0c062172938909bfaa9834dae  config-edge-virt.x86_64
diff --git a/community/linux-edge/config-edge.riscv64 b/community/linux-edge/config-edge.riscv64
index 4fa2e9eb3ac9..7010c279366f 100644
--- a/community/linux-edge/config-edge.riscv64
+++ b/community/linux-edge/config-edge.riscv64
@@ -564,9 +564,15 @@ CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_ROUTE_CLASSID=y
 # CONFIG_IP_PNP is not set
 CONFIG_NET_IPIP=m
-# CONFIG_NET_IPGRE_DEMUX is not set
+CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_NET_IP_TUNNEL=m
-# CONFIG_IP_MROUTE is not set
+CONFIG_NET_IPGRE=m
+# CONFIG_NET_IPGRE_BROADCAST is not set
+CONFIG_IP_MROUTE_COMMON=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+# CONFIG_IP_PIMSM_V1 is not set
+# CONFIG_IP_PIMSM_V2 is not set
 CONFIG_SYN_COOKIES=y
 # CONFIG_NET_IPVTI is not set
 CONFIG_NET_UDP_TUNNEL=m
@@ -617,6 +623,7 @@ CONFIG_IPV6_SIT=m
 # CONFIG_IPV6_SIT_6RD is not set
 CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_GRE is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_IPV6_MROUTE is not set
 # CONFIG_IPV6_SEG6_LWTUNNEL is not set
@@ -630,6 +637,7 @@ CONFIG_MPTCP_IPV6=y
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_ADVANCED=y
+# CONFIG_BRIDGE_NETFILTER is not set
 
 #
 # Core Netfilter Configuration
@@ -943,7 +951,9 @@ CONFIG_IP6_NF_TARGET_NPT=m
 # end of IPv6: Netfilter Configuration
 
 CONFIG_NF_DEFRAG_IPV6=m
+# CONFIG_NF_TABLES_BRIDGE is not set
 CONFIG_NF_CONNTRACK_BRIDGE=m
+# CONFIG_BRIDGE_NF_EBTABLES is not set
 # CONFIG_BPFILTER is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
@@ -951,12 +961,18 @@ CONFIG_NF_CONNTRACK_BRIDGE=m
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_L2TP is not set
-# CONFIG_BRIDGE is not set
+CONFIG_STP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+# CONFIG_BRIDGE_VLAN_FILTERING is not set
+# CONFIG_BRIDGE_MRP is not set
+# CONFIG_BRIDGE_CFM is not set
 # CONFIG_NET_DSA is not set
 CONFIG_VLAN_8021Q=m
 # CONFIG_VLAN_8021Q_GVRP is not set
 # CONFIG_VLAN_8021Q_MVRP is not set
 # CONFIG_DECNET is not set
+CONFIG_LLC=m
 # CONFIG_LLC2 is not set
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
@@ -1860,6 +1876,7 @@ CONFIG_PPP_FILTER=y
 CONFIG_PPP_MPPE=m
 CONFIG_PPP_MULTILINK=y
 CONFIG_PPPOE=m
+# CONFIG_PPTP is not set
 CONFIG_PPP_ASYNC=m
 CONFIG_PPP_SYNC_TTY=m
 CONFIG_SLIP=m
-- 
GitLab