| Message ID | 20211221193941.3805147-2-kuba@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [net-next,1/2] codel: remove unnecessary sock.h include | expand |
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>
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 <linux/rtnetlink.h> + #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 <linux/module.h> +#include <linux/rtnetlink.h> #include <linux/vmalloc.h> #include <net/mac80211.h> 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 <linux/nl80211-vnd-intel.h> +#include <net/netlink.h> 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 <net/netlink.h> + /** * 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 <linux/types.h> #include <linux/ktime.h> #include <linux/skbuff.h> -#include <net/pkt_sched.h> /* 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 <net/pkt_sched.h> + /* Qdiscs using codel plugin must use codel_skb_cb in their own cb[] */ struct codel_skb_cb { codel_time_t enqueue_time;
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 ++ include/net/codel.h | 1 - include/net/codel_qdisc.h | 2 ++ 6 files changed, 8 insertions(+), 1 deletion(-)