diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-04-21 06:20:51 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-04-21 06:20:51 +0300 |
| commit | 2f3a247c3994ece3acb7616965b656622bbf5243 (patch) | |
| tree | 3724380d8a4b31e1e5083c53134a059982b57c84 /include/linux | |
| parent | 7ab75456be144a354fbb3df1516d82fc24d3d67d (diff) | |
| parent | baa951a1c1771810f3a378a95fc93e81953027d5 (diff) | |
| download | linux-2f3a247c3994ece3acb7616965b656622bbf5243.tar.xz | |
Merge branch 'net-extend-drop-reasons'
Johannes Berg says:
====================
net: extend drop reasons
Here's v4 of the extended drop reasons, with fixes to kernel-doc
and checkpatch.
====================
Link: https://lore.kernel.org/r/20230419125254.20789-1-johannes@sipsolutions.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 2 | ||||
| -rw-r--r-- | include/linux/skbuff.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 203c0df2046c..a6a3e9457d6c 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -52,7 +52,7 @@ #include <linux/rbtree.h> #include <net/net_trackers.h> #include <net/net_debug.h> -#include <net/dropreason.h> +#include <net/dropreason-core.h> struct netpoll_info; struct device; diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 03aa7ed076f0..eb9e7bb76fa6 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -37,7 +37,7 @@ #include <linux/netfilter/nf_conntrack_common.h> #endif #include <net/net_debug.h> -#include <net/dropreason.h> +#include <net/dropreason-core.h> /** * DOC: skb checksums |