From patchwork Tue Dec 12 01:58:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 10106117 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 940EA602B3 for ; Tue, 12 Dec 2017 01:58:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 84D46299EB for ; Tue, 12 Dec 2017 01:58:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7926529A0B; Tue, 12 Dec 2017 01:58:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1657299EB for ; Tue, 12 Dec 2017 01:58:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751663AbdLLB6L (ORCPT ); Mon, 11 Dec 2017 20:58:11 -0500 Received: from ozlabs.org ([103.22.144.67]:37355 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751624AbdLLB6H (ORCPT ); Mon, 11 Dec 2017 20:58:07 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3ywjdn3MzLz9s9Y; Tue, 12 Dec 2017 12:58:05 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1513043885; bh=YJBQJtzeY6aCf+25wX2z40TYDb2fQC1qBmctIqGnU3Q=; h=Date:From:To:Cc:Subject:From; b=Sh0QPdL75uD4Rga5xzjnmvOmY68GYyifwA+U8CGYr06IsdthLPEuBreQkbQT76Ms4 KtkcXjuV1yX7Ao+fYCrQGF5IvRavxpsfYf0LjKLw9e0kwyHcRxdk8F7Lvhh8FInTZ9 ZJ/atMeTaV4Pshv5TDP/kw6NOMqMOyHhdMxOcYHFkgaDaD/TVeI0ZGQR/rz/9Sns16 5xYlSEFErmL9KwOp09y80XscEKvwZQeDA3RG3+k71Lp0mvDyxXUhdTeNfRxpZcOnwq mtZcEfa236KSRJK8ygwlk97sNFl8nUCgF7/qrs8nJ6C4E85y6gaXky5BXCdWjLKTCi YDPrT6mE2lXGg== Date: Tue, 12 Dec 2017 12:58:05 +1100 From: Stephen Rothwell To: Johannes Berg , Kalle Valo , Wireless Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Felix Fietkau , Lorenzo Bianconi , Toke =?UTF-8?B?SMO4aWxh?= =?UTF-8?B?bmQtSsO4cmdlbnNlbg==?= , David Miller , Networking Subject: linux-next: build failure after merge of the mac80211-next tree Message-ID: <20171212125805.5f7813fd@canb.auug.org.au> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Johannes, After merging the mac80211-next tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/net/wireless/mediatek/mt76/mt76x2_main.c:539:19: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] .wake_tx_queue = mt76_wake_tx_queue, ^ drivers/net/wireless/mediatek/mt76/mt76x2_main.c:539:19: note: (near initialization for 'mt76x2_ops.wake_tx_queue') Caused by commits 17f1de56df05 ("mt76: add common code shared between multiple chipsets") 7bc04215a66b ("mt76: add driver code for MT76x2e") from the wireless-drivers-next tree interacting with commit e937b8da5a59 ("mac80211: Add TXQ scheduling API") from the mac80211-next tree. I applied the below hack merge fix ... please let me know if something more/better is required. Someone needs to remember to tell Dave when these trees meet in his tree. From: Stephen Rothwell Date: Tue, 12 Dec 2017 12:50:40 +1100 Subject: [PATCH] mt76: fix up for "mac80211: Add TXQ scheduling API" Signed-off-by: Stephen Rothwell --- drivers/net/wireless/mediatek/mt76/mt76.h | 2 +- drivers/net/wireless/mediatek/mt76/tx.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h index aa0880bbea7f..e395d3859212 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76.h +++ b/drivers/net/wireless/mediatek/mt76/mt76.h @@ -338,7 +338,7 @@ void mt76_tx(struct mt76_dev *dev, struct ieee80211_sta *sta, struct mt76_wcid *wcid, struct sk_buff *skb); void mt76_txq_init(struct mt76_dev *dev, struct ieee80211_txq *txq); void mt76_txq_remove(struct mt76_dev *dev, struct ieee80211_txq *txq); -void mt76_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *txq); +void mt76_wake_tx_queue(struct ieee80211_hw *hw); void mt76_stop_tx_queues(struct mt76_dev *dev, struct ieee80211_sta *sta, bool send_bar); void mt76_txq_schedule(struct mt76_dev *dev, struct mt76_queue *hwq); diff --git a/drivers/net/wireless/mediatek/mt76/tx.c b/drivers/net/wireless/mediatek/mt76/tx.c index 4eef69bd8a9e..ad414af0750f 100644 --- a/drivers/net/wireless/mediatek/mt76/tx.c +++ b/drivers/net/wireless/mediatek/mt76/tx.c @@ -463,12 +463,16 @@ void mt76_stop_tx_queues(struct mt76_dev *dev, struct ieee80211_sta *sta, } EXPORT_SYMBOL_GPL(mt76_stop_tx_queues); -void mt76_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *txq) +void mt76_wake_tx_queue(struct ieee80211_hw *hw) { + struct ieee80211_txq *txq; struct mt76_dev *dev = hw->priv; - struct mt76_txq *mtxq = (struct mt76_txq *) txq->drv_priv; - struct mt76_queue *hwq = mtxq->hwq; + struct mt76_txq *mtxq; + struct mt76_queue *hwq; + txq = ieee80211_next_txq(hw); + mtxq = (struct mt76_txq *) txq->drv_priv; + hwq = mtxq->hwq; spin_lock_bh(&hwq->lock); if (list_empty(&mtxq->list)) list_add_tail(&mtxq->list, &hwq->swq);