All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Berg <johannes@sipsolutions.net>
To: netdev@vger.kernel.org
Cc: linux-wireless@vger.kernel.org, Johannes Berg <johannes.berg@intel.com>
Subject: [PATCH net-next v4 1/3] net: move dropreason.h to dropreason-core.h
Date: Wed, 19 Apr 2023 14:52:52 +0200	[thread overview]
Message-ID: <20230419145225.5b5e0b8acb95.I14d12f483727910cddb776e5a84f75ed4e1d8b3e@changeid> (raw)
In-Reply-To: <20230419125254.20789-1-johannes@sipsolutions.net>

From: Johannes Berg <johannes.berg@intel.com>

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>
---
v3: new patch
v4: fix a kernel-doc issue
---
 include/linux/netdevice.h                       | 2 +-
 include/linux/skbuff.h                          | 2 +-
 include/net/{dropreason.h => dropreason-core.h} | 7 ++++---
 include/net/inet_frag.h                         | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename include/net/{dropreason.h => dropreason-core.h} (98%)

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index a740be3bb911..c7e05e6352a1 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 82511b2f61ea..795b091e6d7d 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
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 c0a3ea806cd5..ade6d5b9186c 100644
--- 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 b23ddec3cd5c..325ad893f624 100644
--- 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 {
-- 
2.40.0


  reply	other threads:[~2023-04-19 12:53 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-19 12:52 [PATCH net-next v4 0/3] net: extend drop reasons Johannes Berg
2023-04-19 12:52 ` Johannes Berg [this message]
2023-04-19 12:52 ` [PATCH net-next v4 2/3] net: extend drop reasons for multiple subsystems Johannes Berg
2023-04-20 15:20   ` Simon Horman
2023-04-19 12:52 ` [PATCH net-next v4 3/3] mac80211: use the new drop reasons infrastructure Johannes Berg
2023-04-20 15:21   ` Simon Horman
2023-04-21  3:40 ` [PATCH net-next v4 0/3] net: extend drop reasons patchwork-bot+netdevbpf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230419145225.5b5e0b8acb95.I14d12f483727910cddb776e5a84f75ed4e1d8b3e@changeid \
    --to=johannes@sipsolutions.net \
    --cc=johannes.berg@intel.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.