net: move dropreason.h to dropreason-core.h

This will, after the next patch, hold only the core
drop reasons and minimal infrastructure. Fix a small
kernel-doc issue while at it, to avoid the move
triggering a checker.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 203c0df..a6a3e94 100644 (file)
--- 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 03aa7ed..eb9e7bb 100644 (file)
--- 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

diff --git a/include/net/dropreason.h b/include/net/dropreason-core.h
similarity index 98%
rename from include/net/dropreason.h
rename to include/net/dropreason-core.h
index c0a3ea8..ade6d5b 100644 (file)
--- a/include/net/dropreason.h
+++ b/include/net/dropreason-core.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#ifndef _LINUX_DROPREASON_H
-#define _LINUX_DROPREASON_H
+#ifndef _LINUX_DROPREASON_CORE_H
+#define _LINUX_DROPREASON_CORE_H
 
 #define DEFINE_DROP_REASON(FN, FNe)    \
        FN(NOT_SPECIFIED)               \
@@ -334,7 +334,8 @@ enum skb_drop_reason {
        SKB_DROP_REASON_IPV6_NDISC_BAD_CODE,
        /** @SKB_DROP_REASON_IPV6_NDISC_BAD_OPTIONS: invalid NDISC options. */
        SKB_DROP_REASON_IPV6_NDISC_BAD_OPTIONS,
-       /** @SKB_DROP_REASON_IPV6_NDISC_NS_OTHERHOST: NEIGHBOUR SOLICITATION
+       /**
+        * @SKB_DROP_REASON_IPV6_NDISC_NS_OTHERHOST: NEIGHBOUR SOLICITATION
         * for another host.
         */
        SKB_DROP_REASON_IPV6_NDISC_NS_OTHERHOST,

diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
index b23ddec..325ad89 100644 (file)
--- a/include/net/inet_frag.h
+++ b/include/net/inet_frag.h
@@ -7,7 +7,7 @@
 #include <linux/in6.h>
 #include <linux/rbtree_types.h>
 #include <linux/refcount.h>
-#include <net/dropreason.h>
+#include <net/dropreason-core.h>
 
 /* Per netns frag queues directory */
 struct fqdir {