From patchwork Sat Jul 13 08:50:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiji Yang X-Patchwork-Id: 1960085 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=fOs29GST; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=outlook.com header.i=@outlook.com header.a=rsa-sha256 header.s=selector1 header.b=i6W1h2X5; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WLj0k1MWxz1xqx for ; Sat, 13 Jul 2024 18:53:09 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=SZZTebhc+ebx4GIruKCQ6aju4iKeE63YFFENDXrCBbs=; b=fOs29GST0vPcW4 aR411MkOH/lMsRndSXhCmpz2cT5u/oKdPAqe5V0gWBwWLUsLRrxyH+FyVJ5P4xQlAxHbv0e0tNDKZ Xdg6N13hw/bUAOHsx/lvqz4HreTPnSsFCG2gAYMHI5aL3ziSpbUTORMj03id9CrUc7I62mMVqoSfA uMTKYKOisjiuKRIrIDa8zVWgjw/F3WbtZ08ezsa1qGNENWbcqG43F9Rd4fW4eTo37A38O84zUU5lS mdImNhDdcTHoZIEKj3QEG3P/f9jZzO2E9r0egxz7iTHezYjjOfm+jJqwZWt8nBz5Xf6T/QnfRFGmv U1CrqL6FwExd5SpZcBFw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sSYTd-00000002CsJ-0blm; Sat, 13 Jul 2024 08:51:33 +0000 Received: from mail-japaneastazolkn190110001.outbound.protection.outlook.com ([2a01:111:f403:d405::1] helo=TYVP286CU001.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sSYTa-00000002Cqp-31iW for openwrt-devel@lists.openwrt.org; Sat, 13 Jul 2024 08:51:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OVETuBNr/34w6kQxNjTcYB2SLwo0qgQI9lH26jg4zLo7zMcFdy396Vfi22mvwU4T6nA0zWiCUTgmOZWgnthQFiYLaUHY1lK5LyPPO2phfZHtLpRV+ieTspGGWKh/sKHAvQ1lO3wPRSP5oBLjKs+gViNqY0i2REdUUT1vcuxFnqxlNAc7zQIXO3zbhJGKknWkTCZaNXnaI8vfYVr7YhTfA6lWezQeay+wDu/k1JTWSVGfdCJD/RjmJkoCzp4/bpvrVsW2I2AXHIO3R8UpFZAtIgwpXlidyRK2iqlXSnv0Yck9GJ9vitUmunNzbEDF3Z5Jz8DUoPLLSkS5PThrmx5Tug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=FLGiGs3gQ43fUElvgGKbvrBC2QW+0VaAEfhMnhUvlPw=; b=FI6gCF3pzIsL8J0x+kw9s7H3eX4/gz6u5uaRCW44Ut5dFW4IQrC8oW0cOEJJEy2UcLCiaFk51/uCytV0IYDjyELsHJgxHph5zJ28dz1TFIXdvGOZAeyF16nZ0V3CQ0Q3vIf7t6ayCPsmTfzTEcZ84vB20ZJ7FQ06KNTk5ln7kyM24+AfkO+sediMFW5B0WL31NcnlcD8WF/aonYb0nn+XRxE/lIlnXZfX8LigbFfP8oircXR6KpppkEUBIHx8fPUiunqcdU7ViS3pdEM5lImJ/YlGwNRwVod7bDNTVbKF2MQxi8xWaDyRBBF/2YG6j9XN+d2eqesh6Ij2H2VrjVSlw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FLGiGs3gQ43fUElvgGKbvrBC2QW+0VaAEfhMnhUvlPw=; b=i6W1h2X5ZAPeAClOfsFnDvVmoDVwJMLFCBt+IrK8/6VGg3n3Obyla1MBUV4xLNS6SVJ3eKstNs1zm7TIcQKJiBDbesXOS8UI+1PTeGEwa7feg8uB+W7Yta9kqTUOaHyWZkhcJO50K5dxInWrkMZvdfnsBUbAAT4l/O0GsgCE07Us6ryrxOWbbOT0Ys8iIR4Qv8ipx49T1x615hYRI15s6V0Awpa6W3M6LwJOA3EA6pxElwKSKFajdQzdH14AUGB9CQlb9GlVJIV3qbqcgs9hcwsoCXpdBdatcyBrtdhuvaM5ltyA3Y11fstl5G12KmLbpgZzIVslWTSga3uvMuF5pQ== Received: from TYCP286MB0895.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:77::8) by OS9P286MB4243.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:2c4::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23; Sat, 13 Jul 2024 08:51:19 +0000 Received: from TYCP286MB0895.JPNP286.PROD.OUTLOOK.COM ([fe80::ad5c:3146:bd0d:f17c]) by TYCP286MB0895.JPNP286.PROD.OUTLOOK.COM ([fe80::ad5c:3146:bd0d:f17c%5]) with mapi id 15.20.7762.024; Sat, 13 Jul 2024 08:51:19 +0000 From: Shiji Yang To: openwrt-devel@lists.openwrt.org Cc: Felix Fietkau , Shiji Yang Subject: [PATCH] rtl8812au-ct: fix build with mac80211 6.9.9 backport Date: Sat, 13 Jul 2024 16:50:59 +0800 Message-ID: X-Mailer: git-send-email 2.39.2 X-TMN: [a/CTNf52SCvP4zbCjel2XD5AB0BIMvCI] X-ClientProxiedBy: TYCPR01CA0117.jpnprd01.prod.outlook.com (2603:1096:405:4::33) To TYCP286MB0895.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:77::8) X-Microsoft-Original-Message-ID: <20240713085059.1231-1-yangshiji66@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCP286MB0895:EE_|OS9P286MB4243:EE_ X-MS-Office365-Filtering-Correlation-Id: d7a74fa2-3533-4bc9-cfa4-08dca318f5e9 X-Microsoft-Antispam: BCL:0;ARA:14566002|19110799003|8060799006|461199028|4302099013|3412199025|440099028|1602099012; X-Microsoft-Antispam-Message-Info: MFUJ9mnir4lmEhplShyQaom7HuUm8JVadBIopkefMDosiXL8YtL5NgBBsAT5NadSh40Bk3ceiiC7ZMdMXdiV3xkk8KMwSJdpwTcBSUuvMAYub5htn5MqdU3ooXIQWWDUgvCMnM8yToBsqJB/7yi6iNWpGpsfmbIcPPQo2Nn22s/D6Zi7hBwUY+qKZ6hc6n1skvyTUa/bpyJwsHldw1hzTQ1Pfl4StRq6jSXMjn/yN5e6kcfZPXIT1uNbhBieVdek+7EMQhE9hOeslMe+ql5FqqB0f7dwwnHyBSwFxyEDkPq3BQf8MMvQIoPIHolCX1jGOWIAGOCX4xy4JK7t7/9vTYKfVSdSIyPSkmQY1QAvzLBP7aGCzdUHuWlQriOJWreNd9y/SAjTcWlP8Hl6SzBT73ID38xnHg5MgBYwP5wpcJiJPj9jB/aS9UwBP3LKoJNsK2derHPfDH2In9teR8sEnXJRvjpUUupOTaSAcLBTwVdMoyVEPhCGmv29bnurQjKATWrqB0R7PWCBHUyqZVUm5LxDvOsaOV/7sp7nYgP4r+9FpAr7iaL7+fldrwVECn1wG4BWRt+N6A4c3gXkVLTFEcpWq4FtujCcN4hqtxEH3VWB6usaCeFNzn6Yw/vTQ8QD8c7miFV27bZ0uq8w0kWOoEEnTjWIXC0yCS8xJ2zuU8bNfOCwNtpH0xyo4PPlW0qF+2zx1BWvBFQ2T6pVaxQdUq0VNRwVMdcsAfPVq8jBiIr7sFrex8ad+nx1U7on6a4i X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: F6orPi+5C4SpzKW+MVymNEc7iKsvnWG3ijrIJBMwu120r5qVW2dlYjCZu9BGANbQwU0yU5KOyOyi88uJH/EEWB1LUl1D/yiWpjVrdgKX9OjqrRvchYwCpMAaV2npk7JhSwYVmo0AlxHsASh0NzXJLoaK2XTzCT9IOb0UJ4RlOAWV9RP/GBa6FhRq3+EiyoIN8EWR6y6RVAQ0TwIGGjxPRya+SFz9dF2NAGH7voiWdRKiOaBS/7zVqxfYQBWnzYl4UElbYz2JJnx9epex8jdO7G/mg9UYfpJJ4VdTqz0b8ei1vH/4Y392DKexkhFQ3b/a+02yUpvN6GVarsWzb/VZfhTNV+FjOnH8rsxPKFfZLFo2rRvtpPykHfu1sO6JIflGRxgn3aZ0KR6dw3XHYfObQNOy1o/A/sHBlwTBtDNEZG4VZl+kpvWCrJfDLUUsAo9YuPZPlqbEzSDqTzlfY73VhJ6Q3o+r2M/EYTZj8WV8jYP+6R+mIh8EsrvGOraYIDmMFuJfeuXzr372negywb+GS5NkBxkR/DDIMtfJC21ICmLThYFmGcFeNhjppEpm3eZqY9B7vdjMRJFdURrU6cbxG5iZacXR80kIQZE7trzSkSWPKUxX4syprS25CnaU6dlnxH1u0u2HfWTKdNlUMZEWYiCzt01bJCBHMGPI/IecLvV8IpjJClmoX9e9EGwzOUP0VGsTzlmJUOXlc1Ufx3Hsm6h4cA63mrkMfjdmIEd1rYaP/9ek8vg3JXdeASVBSVYCnL3JvpYJ3zuv0x3IRehaTpL97JbeMSWdcMa4+5GJ8nt4MbTGD4A1x81Zx3dG60eQteC74pmCfAy5CCDRq0KtoZ1hROV/kdRzNaWn7jeL1S3ck/b5snJAuzuSGtYkx0ZyyGiv3cO+YhXqOC61ubcVQSqYJW/lIaLzE2S1ojcphJD+VaSCshrYltLiNMNgmaArix9V1NzyaUUErzeNjUtC/ng9Ch3zHN7NsREHDm8552ShWYzwFHJA4XOpSrQgChMLuvtNpVIkOPR3hoLSUqL3GipoytgRkp6S3wzHnEcbfs4Arss2p3Lr5jRXB+vv+m3nSAAH9WJaYdYQurURBtj/rPtcVMMMTs7K7elQCT1m++WP1ONfmxCner/+tuOmKweK3Zs4MykHxH7/gsY+1p+DM2NLuJXBSRgKbQ3PzuPOS73u/mGzk5N77/I7AsxL5CsTFe1OVkK0qnJ+g9zmeKH4Nk0jet6e4tH3DKR9NyQIHjqQ9ANuL0dMG2Fms/dYuvOK X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d7a74fa2-3533-4bc9-cfa4-08dca318f5e9 X-MS-Exchange-CrossTenant-AuthSource: TYCP286MB0895.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2024 08:51:18.2995 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS9P286MB4243 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240713_015130_799700_8A14BA9D X-CRM114-Status: UNSURE ( 9.55 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.8 (-) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Shiji Yang The change_beacon() API has been updated since the 6.7 kernel. Ref: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.9.9&id=66f85d57b7109baf8a7d5ee04049ac9412611d35 Content analysis details: (-1.8 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 ARC_SIGNED Message has a ARC signature 0.0 ARC_VALID Message has a valid ARC signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [yangshiji66(at)outlook.com] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [yangshiji66(at)outlook.com] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a01:111:f403:d405:0:0:0:1 listed in] [list.dnswl.org] X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Shiji Yang The change_beacon() API has been updated since the 6.7 kernel. Ref: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.9.9&id=66f85d57b7109baf8a7d5ee04049ac9412611d35 Fix build error: ../rtl8812au-ct-2022.10.26~9b2b203a/os_dep/linux/ioctl_cfg80211.c:5984:26: error: initialization of 'int (*)(struct wiphy *, struct net_device *, struct cfg80211_ap_update *)' from incompatible pointer type 'int (*)(struct wiphy *, struct net_device *, struct cfg80211_beacon_data *)' [-Werror=incompatible-pointer-types] 5984 | .change_beacon = cfg80211_rtw_change_beacon, | ^~~~~~~~~~~~~~~~~~~~~~~~~~ ../rtl8812au-ct-2022.10.26~9b2b203a/os_dep/linux/ioctl_cfg80211.c:5984:26: note: (near initialization for 'rtw_cfg80211_ops.change_beacon') Signed-off-by: Shiji Yang --- .../009-fix-build-on-linux-6.7-kernel.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/kernel/rtl8812au-ct/patches/009-fix-build-on-linux-6.7-kernel.patch diff --git a/package/kernel/rtl8812au-ct/patches/009-fix-build-on-linux-6.7-kernel.patch b/package/kernel/rtl8812au-ct/patches/009-fix-build-on-linux-6.7-kernel.patch new file mode 100644 index 0000000000..8a5c15427c --- /dev/null +++ b/package/kernel/rtl8812au-ct/patches/009-fix-build-on-linux-6.7-kernel.patch @@ -0,0 +1,29 @@ +--- a/os_dep/linux/ioctl_cfg80211.c ++++ b/os_dep/linux/ioctl_cfg80211.c +@@ -4020,6 +4020,18 @@ static int cfg80211_rtw_start_ap(struct + return ret; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,7,0))|| defined(BUILD_OPENWRT) ++static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev, ++ struct cfg80211_ap_update *info) ++{ ++ int ret = 0; ++ _adapter *adapter = (_adapter *)rtw_netdev_priv(ndev); ++ ++ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); ++ ++ ret = rtw_add_beacon(adapter, info->beacon.head, info->beacon.head_len, ++ info->beacon.tail, info->beacon.tail_len); ++#else + static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev, + struct cfg80211_beacon_data *info) + { +@@ -4029,6 +4041,7 @@ static int cfg80211_rtw_change_beacon(st + DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); + + ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len); ++#endif + + return ret; + }