| Message ID | 20211221193941.3805147-1-kuba@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | [net-next,1/2] codel: remove unnecessary sock.h include | expand |
Jakub Kicinski <kuba@kernel.org> writes: > 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 <kuba@kernel.org> > --- > 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 ++ Acked-by: Kalle Valo <kvalo@kernel.org>
Jakub Kicinski <kuba@kernel.org> writes: > 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 <kuba@kernel.org> > --- > 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 ++ Acked-by: Kalle Valo <kvalo@kernel.org>
Hello: This series was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Tue, 21 Dec 2021 11:39:40 -0800 you wrote: > 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. > > [...] Here is the summary with links: - [net-next,1/2] codel: remove unnecessary sock.h include https://git.kernel.org/netdev/net-next/c/15fcb1031178 - [net-next,2/2] codel: remove unnecessary pkt_sched.h include https://git.kernel.org/netdev/net-next/c/e6e590445581 You are awesome, thank you!
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 <linux/vmalloc.h> + #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 <linux/ip.h> +#include <linux/udp.h> #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 <linux/vmalloc.h> + #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 <linux/ktime.h> #include <linux/skbuff.h> #include <net/pkt_sched.h> -#include <net/inet_ecn.h> /* 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 <net/inet_ecn.h> + static void codel_params_init(struct codel_params *params) { params->interval = MS2TIME(100);
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 <kuba@kernel.org> --- 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(-)