From patchwork Tue Dec 21 19:39:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 526799 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 BAA3DC433EF for ; Tue, 21 Dec 2021 19:39:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241835AbhLUTjv (ORCPT ); Tue, 21 Dec 2021 14:39:51 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:46792 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234416AbhLUTju (ORCPT ); Tue, 21 Dec 2021 14:39:50 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 6CEB6B816B3; Tue, 21 Dec 2021 19:39:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0D628C36AE8; Tue, 21 Dec 2021 19:39:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1640115588; bh=bNfUoZedx6yXkJHuvzaeMl8iyE0ktEf9fQ6+7LtJZWY=; h=From:To:Cc:Subject:Date:From; b=Spc7MnxE9o+x2TwYu/sgN3HGbzPb2DbsH5IuMZ1mG/w/Rc0CgIoCSbjnojjU/DCOz e629SJi+PZ0hkbd6SBkv6L2qxDBTlCDYYNuJ9qgITj4w0EJe5oxqDy1tqBefpfAJ9h mqejR2NhJCQdhnu3LRPqw68lN1IC2ABUViqkkDq+FExPz6BNTyEhS/74anffxCB5Cp XuXfXQk3QB6Nxu7xNKq0VLpkQkfWAZRL0XfJZpFdol4lLFlZf6wcperMVrWDSRAVFh vryUXC9MaoAtAwBXW2raStQbRrC5AuqTceH7D2y0mN5UqV4cLGxrlWZldyY1I8P4R8 /Ne1WXyWW9YkA== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, Jakub Kicinski , kvalo@kernel.org, pkshih@realtek.com, ath11k@lists.infradead.org, linux-wireless@vger.kernel.org Subject: [PATCH net-next 1/2] codel: remove unnecessary sock.h include Date: Tue, 21 Dec 2021 11:39:40 -0800 Message-Id: <20211221193941.3805147-1-kuba@kernel.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Since sock.h is modified relatively often (60 times in the last 12 months) it seems worthwhile to decrease the incremental build work. CoDel's header includes net/inet_ecn.h which in turn includes net/sock.h. codel.h is itself included by mac80211 which is included by much of the WiFi stack and drivers. Removing the net/inet_ecn.h include from CoDel breaks the dependecy between WiFi and sock.h. Commit d068ca2ae2e6 ("codel: split into multiple files") moved all the code which actually needs ECN helpers out to net/codel_impl.h, the include can be moved there as well. This decreases the incremental build size after touching sock.h from 4999 objects to 4051 objects. Fix unmasked missing includes in WiFi drivers. Signed-off-by: Jakub Kicinski Acked-by: Kalle Valo Acked-by: Kalle Valo --- CC: kvalo@kernel.org CC: pkshih@realtek.com CC: ath11k@lists.infradead.org CC: linux-wireless@vger.kernel.org --- drivers/net/wireless/ath/ath11k/debugfs.c | 2 ++ drivers/net/wireless/realtek/rtw89/core.c | 2 ++ drivers/net/wireless/realtek/rtw89/debug.c | 2 ++ include/net/codel.h | 1 - include/net/codel_impl.h | 2 ++ 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath11k/debugfs.c b/drivers/net/wireless/ath/ath11k/debugfs.c index dba055d085be..eb8b4f20c95e 100644 --- a/drivers/net/wireless/ath/ath11k/debugfs.c +++ b/drivers/net/wireless/ath/ath11k/debugfs.c @@ -3,6 +3,8 @@ * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved. */ +#include + #include "debugfs.h" #include "core.h" diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c index cf05baf88640..a0737eea9f81 100644 --- a/drivers/net/wireless/realtek/rtw89/core.c +++ b/drivers/net/wireless/realtek/rtw89/core.c @@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* Copyright(c) 2019-2020 Realtek Corporation */ +#include +#include #include "coex.h" #include "core.h" diff --git a/drivers/net/wireless/realtek/rtw89/debug.c b/drivers/net/wireless/realtek/rtw89/debug.c index 9756d75ef24e..22bd1d03e722 100644 --- a/drivers/net/wireless/realtek/rtw89/debug.c +++ b/drivers/net/wireless/realtek/rtw89/debug.c @@ -2,6 +2,8 @@ /* Copyright(c) 2019-2020 Realtek Corporation */ +#include + #include "coex.h" #include "debug.h" #include "fw.h" diff --git a/include/net/codel.h b/include/net/codel.h index a6c9e34e62b8..d74dd8fda54e 100644 --- a/include/net/codel.h +++ b/include/net/codel.h @@ -45,7 +45,6 @@ #include #include #include -#include /* Controlling Queue Delay (CoDel) algorithm * ========================================= diff --git a/include/net/codel_impl.h b/include/net/codel_impl.h index 137d40d8cbeb..78a27ac73070 100644 --- a/include/net/codel_impl.h +++ b/include/net/codel_impl.h @@ -49,6 +49,8 @@ * Implemented on linux by Dave Taht and Eric Dumazet */ +#include + static void codel_params_init(struct codel_params *params) { params->interval = MS2TIME(100); From patchwork Tue Dec 21 19:39:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 527383 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 907B6C433FE for ; Tue, 21 Dec 2021 19:39:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241836AbhLUTjv (ORCPT ); Tue, 21 Dec 2021 14:39:51 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:46810 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237467AbhLUTjv (ORCPT ); Tue, 21 Dec 2021 14:39:51 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 16BECB81990; Tue, 21 Dec 2021 19:39:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62828C36AEA; Tue, 21 Dec 2021 19:39:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1640115588; bh=wRRFAUwQWksyjwTR4qA4+DrhT6T2cP/utpnaRghH37c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r3TbihOgQMBsKPbw22G8Qpn+olIzOlxx31zDblcZum4j3m/fYirRsmpShmLOcH2jw OvVXAmDnaNVzHxdVjn0KaXWkPKwY31WGfKlWygRJrB16tOOab3rr5JgFUjUtBxrMla o67uAPYhVSI0CMqWAIapqtCxQuI+OxSIULSkA7xn2XHUiafqvloX6VHwI7q0rR52Cb F0G5/5oOiW4QWg4jMvOg4iH7RAVdVjr3Ao/m/6tKjPfDgbeOgMXyxoU6NdfYlugbjj NSrtoQg09lC9WGxkHt1fM0jzaeTzafwV8rZL0D3T6ThByaSx4ZICUKoBR6IJdDLL1h xvtAwdyIUYZuA== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, Jakub Kicinski , kvalo@kernel.org, luciano.coelho@intel.com, nbd@nbd.name, lorenzo.bianconi83@gmail.com, ryder.lee@mediatek.com, shayne.chen@mediatek.com, sean.wang@mediatek.com, johannes.berg@intel.com, emmanuel.grumbach@intel.com, ath11k@lists.infradead.org, linux-wireless@vger.kernel.org Subject: [PATCH net-next 2/2] codel: remove unnecessary pkt_sched.h include Date: Tue, 21 Dec 2021 11:39:41 -0800 Message-Id: <20211221193941.3805147-2-kuba@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211221193941.3805147-1-kuba@kernel.org> References: <20211221193941.3805147-1-kuba@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Commit d068ca2ae2e6 ("codel: split into multiple files") moved all Qdisc-related code to codel_qdisc.h, move the include of pkt_sched.h as well. This is similar to the previous commit, although we don't care as much about incremental builds after pkt_sched.h was touched itself it is included by net/sch_generic.h which is modified ~20 times a year. This decreases the incremental build size after touching pkt_sched.h from 1592 to 617 objects. Fix unmasked missing includes in WiFi drivers. Signed-off-by: Jakub Kicinski --- CC: kvalo@kernel.org CC: luciano.coelho@intel.com CC: nbd@nbd.name CC: lorenzo.bianconi83@gmail.com CC: ryder.lee@mediatek.com CC: shayne.chen@mediatek.com CC: sean.wang@mediatek.com CC: johannes.berg@intel.com CC: emmanuel.grumbach@intel.com CC: ath11k@lists.infradead.org CC: linux-wireless@vger.kernel.org --- drivers/net/wireless/ath/ath11k/reg.c | 2 ++ drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 1 + drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c | 1 + drivers/net/wireless/mediatek/mt76/testmode.h | 2 ++ include/net/codel.h | 1 - include/net/codel_qdisc.h | 2 ++ 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath11k/reg.c b/drivers/net/wireless/ath/ath11k/reg.c index 1f8a81987187..d6575feca5a2 100644 --- a/drivers/net/wireless/ath/ath11k/reg.c +++ b/drivers/net/wireless/ath/ath11k/reg.c @@ -2,6 +2,8 @@ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. */ +#include + #include "core.h" #include "debug.h" diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c index f12e571d3581..a3324c30af90 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c @@ -5,6 +5,7 @@ * Copyright (C) 2016-2017 Intel Deutschland GmbH */ #include +#include #include #include diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c b/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c index f702ad85e609..78450366312b 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c @@ -4,6 +4,7 @@ */ #include "mvm.h" #include +#include static const struct nla_policy iwl_mvm_vendor_attr_policy[NUM_IWL_MVM_VENDOR_ATTR] = { diff --git a/drivers/net/wireless/mediatek/mt76/testmode.h b/drivers/net/wireless/mediatek/mt76/testmode.h index d1f9c036dd1f..725973f1ca58 100644 --- a/drivers/net/wireless/mediatek/mt76/testmode.h +++ b/drivers/net/wireless/mediatek/mt76/testmode.h @@ -7,6 +7,8 @@ #define MT76_TM_TIMEOUT 10 +#include + /** * enum mt76_testmode_attr - testmode attributes inside NL80211_ATTR_TESTDATA * diff --git a/include/net/codel.h b/include/net/codel.h index d74dd8fda54e..5fed2f16cb8d 100644 --- a/include/net/codel.h +++ b/include/net/codel.h @@ -44,7 +44,6 @@ #include #include #include -#include /* Controlling Queue Delay (CoDel) algorithm * ========================================= diff --git a/include/net/codel_qdisc.h b/include/net/codel_qdisc.h index 098630f83a55..58b6d0ebea10 100644 --- a/include/net/codel_qdisc.h +++ b/include/net/codel_qdisc.h @@ -49,6 +49,8 @@ * Implemented on linux by Dave Taht and Eric Dumazet */ +#include + /* Qdiscs using codel plugin must use codel_skb_cb in their own cb[] */ struct codel_skb_cb { codel_time_t enqueue_time;