From patchwork Fri Dec 31 17:07:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Klaus Mueller X-Patchwork-Id: 529475 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0644AC433F5 for ; Fri, 31 Dec 2021 17:13:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230374AbhLaRNE (ORCPT ); Fri, 31 Dec 2021 12:13:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229699AbhLaRNB (ORCPT ); Fri, 31 Dec 2021 12:13:01 -0500 X-Greylist: delayed 319 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Fri, 31 Dec 2021 09:13:01 PST Received: from mout0.freenet.de (mout0.freenet.de [IPv6:2001:748:100:40::2:2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 202CDC061574 for ; Fri, 31 Dec 2021 09:13:01 -0800 (PST) Received: from [195.4.92.122] (helo=sub3.freenet.de) by mout0.freenet.de with esmtpa (ID andihartmann@freenet.de) (port 25) (Exim 4.92 #3) id 1n3LNS-0008QU-LS for linux-wireless@vger.kernel.org; Fri, 31 Dec 2021 18:07:38 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=justmail.de ; s=mjaymdexmjqk; h=Subject:From:To:MIME-Version:Date:Message-ID:Content-Type :Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Xlzrxh7JQtps10BW+uGVvWVsROhshMlEtOPmlYrwQzk=; b=dcMxXfBsN1bu+jGUHbPmtCxYFq IeyX7Ykr3vpqobqDtV9xuN4+eUdRxGBNvm8nKCODax0OZH8VRIyouxQV10ti+mdMDENplxu2i81i9 c0rUeHyenPdx4Va+UmAcgedHdj0FqrbBUp4RII1AmnBgXfw3BfGLCKO7ozLrP1/TdmTUrEN6+5bK8 VCNlW+3mWPRh0CADhS/nJF3bBG+VrsSs/jtoSLAyQ9IxYzOySKMOysVInrFd1jxX3iCVTXK+STPZm 7KT7CuSj2tqg4AktQnRBesIfZhjZoCebeB21gAQyr5f0YmakLKBg7Wxzc5QsDDEQQKlMIKS9VR+X6 wlX1Nsag==; Received: from p200300de574ba600505400fffe15ac42.dip0.t-ipconnect.de ([2003:de:574b:a600:5054:ff:fe15:ac42]:50152 helo=mail.maya.org) by sub3.freenet.de with esmtpsa (ID andihartmann@freenet.de) (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (port 465) (Exim 4.92 #3) id 1n3LNS-0003b7-Iy for linux-wireless@vger.kernel.org; Fri, 31 Dec 2021 18:07:38 +0100 Received: internal info suppressed Message-ID: Date: Fri, 31 Dec 2021 18:07:48 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 Content-Language: en-US To: "linux-wireless@vger.kernel.org" From: Klaus Mueller Subject: rtw88 (https://github.com/lwfinger/rtw88) / compile error since 5.15? X-Originated-At: 2003:de:574b:a600:5054:ff:fe15:ac42!50152 X-FNSign: v=2 s=7084C6090B58D86AB622A53E521E57AC7E6A5860AB80213B51406D4D6E687AA5 X-Scan-TS: Fri, 31 Dec 2021 18:07:38 +0100 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Hello, I found an error compiling rtw88 w/ kernel 5.15(.12). The attached short patch fixes it (works for me). Could you please apply a better patch? Thanks Klaus --- mac80211.c.orig 2021-05-26 22:03:18.636003469 +0200 +++ mac80211.c 2021-12-31 15:21:01.243896526 +0100 @@ -655,13 +655,14 @@ mutex_unlock(&rtwdev->mutex); } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 18, 0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0) static void rtw_ops_mgd_prepare_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - u16 duration) + struct ieee80211_prep_tx_info *info) #else static void rtw_ops_mgd_prepare_tx(struct ieee80211_hw *hw, - struct ieee80211_vif *vif) + struct ieee80211_vif *vif, + u16 duration) #endif { struct rtw_dev *rtwdev = hw->priv;