From 610e79a825b9857848cf352530b3390de537ec28 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 26 Jun 2023 17:01:21 +0200
Subject: [PATCH] Fix & update kernel 5.15

---
 ....0-net-mii-add-mii_bmcr_encode_fixed.patch | 55 -------------------
 5.15/target/linux/generic/config-5.15         |  1 +
 build.sh                                      |  7 ++-
 3 files changed, 7 insertions(+), 56 deletions(-)
 delete mode 100644 5.15/target/linux/generic/backport-5.15/799-v6.0-net-mii-add-mii_bmcr_encode_fixed.patch

diff --git a/5.15/target/linux/generic/backport-5.15/799-v6.0-net-mii-add-mii_bmcr_encode_fixed.patch b/5.15/target/linux/generic/backport-5.15/799-v6.0-net-mii-add-mii_bmcr_encode_fixed.patch
deleted file mode 100644
index 87d7ff61..00000000
--- a/5.15/target/linux/generic/backport-5.15/799-v6.0-net-mii-add-mii_bmcr_encode_fixed.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From bdb6cfe7512f7a214815a3092f0be50963dcacbc Mon Sep 17 00:00:00 2001
-From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
-Date: Sat, 18 Jun 2022 11:28:32 +0100
-Subject: [PATCH] net: mii: add mii_bmcr_encode_fixed()
-
-Add a function to encode a fixed speed/duplex to a BMCR value.
-
-Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- include/linux/mii.h | 35 +++++++++++++++++++++++++++++++++++
- 1 file changed, 35 insertions(+)
-
---- a/include/linux/mii.h
-+++ b/include/linux/mii.h
-@@ -595,4 +595,39 @@ static inline u8 mii_resolve_flowctrl_fd
- 	return cap;
- }
- 
-+/**
-+ * mii_bmcr_encode_fixed - encode fixed speed/duplex settings to a BMCR value
-+ * @speed: a SPEED_* value
-+ * @duplex: a DUPLEX_* value
-+ *
-+ * Encode the speed and duplex to a BMCR value. 2500, 1000, 100 and 10 Mbps are
-+ * supported. 2500Mbps is encoded to 1000Mbps. Other speeds are encoded as 10
-+ * Mbps. Unknown duplex values are encoded to half-duplex.
-+ */
-+static inline u16 mii_bmcr_encode_fixed(int speed, int duplex)
-+{
-+	u16 bmcr;
-+
-+	switch (speed) {
-+	case SPEED_2500:
-+	case SPEED_1000:
-+		bmcr = BMCR_SPEED1000;
-+		break;
-+
-+	case SPEED_100:
-+		bmcr = BMCR_SPEED100;
-+		break;
-+
-+	case SPEED_10:
-+	default:
-+		bmcr = BMCR_SPEED10;
-+		break;
-+	}
-+
-+	if (duplex == DUPLEX_FULL)
-+		bmcr |= BMCR_FULLDPLX;
-+
-+	return bmcr;
-+}
-+
- #endif /* __LINUX_MII_H__ */
diff --git a/5.15/target/linux/generic/config-5.15 b/5.15/target/linux/generic/config-5.15
index a112903a..1b07217c 100644
--- a/5.15/target/linux/generic/config-5.15
+++ b/5.15/target/linux/generic/config-5.15
@@ -6342,6 +6342,7 @@ CONFIG_TINY_RCU=y
 # CONFIG_TI_TSC2046 is not set
 # CONFIG_TLAN is not set
 # CONFIG_TLS is not set
+# CONFIG_TLS_TOE is not set
 # CONFIG_TMD_HERMES is not set
 # CONFIG_TMP006 is not set
 # CONFIG_TMP007 is not set
diff --git a/build.sh b/build.sh
index dd043526..c4f06898 100755
--- a/build.sh
+++ b/build.sh
@@ -101,10 +101,15 @@ if [ "$OMR_OPENWRT" = "default" ]; then
 #		_get_repo "$OMR_TARGET/${OMR_KERNEL}/source" https://github.com/coolsnowwolf/lede.git "master"
 #		_get_repo feeds/${OMR_KERNEL}/packages https://github.com/openwrt/packages "master"
 #		_get_repo feeds/${OMR_KERNEL}/luci https://github.com/openwrt/luci "master"
-	else
+#	else
 #		_get_repo "$OMR_TARGET/${OMR_KERNEL}/source" https://github.com/openwrt/openwrt "e11d00d44c66b1534fbc399fda55951cd0a2168a"
 #		_get_repo feeds/${OMR_KERNEL}/packages https://github.com/openwrt/packages "0d8fc4124cf60cce3133a8dcc218411c8ce9565b"
 #		_get_repo feeds/${OMR_KERNEL}/luci https://github.com/openwrt/luci "b683ff3ea2bbd49a38b12bab4225440ba3de5ff5"
+	elif [ "$OMR_KERNEL" = "5.15" ]; then
+		_get_repo "$OMR_TARGET/${OMR_KERNEL}/source" https://github.com/openwrt/openwrt "106c83a1eafcccb6059a0427953b7780d184c692"
+		_get_repo feeds/${OMR_KERNEL}/packages https://github.com/openwrt/packages "8939b43659dabe9b737feee02976949ad0355adc"
+		_get_repo feeds/${OMR_KERNEL}/luci https://github.com/openwrt/luci "3e14e055a177dec4bd3a4bd40883b56a6930fd7c"
+	elif [ "$OMR_KERNEL" = "6.1" ]; then
 		_get_repo "$OMR_TARGET/${OMR_KERNEL}/source" https://github.com/openwrt/openwrt "ed816f6ba8b5e3df609e5fc53f7bcb09bdaa16be"
 		_get_repo feeds/${OMR_KERNEL}/packages https://github.com/openwrt/packages "a9cda9150232c4907607a3f19ad1d0833541bc89"
 		_get_repo feeds/${OMR_KERNEL}/luci https://github.com/openwrt/luci "5865d02bfd9dad34e2d3106d57675045d8eb235c"