mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 21:33:52 +00:00
Merge branch 'genetlink-remove-linux-genetlink-h'
Jakub Kicinski says: ==================== genetlink: remove linux/genetlink.h There are two genetlink headers net/genetlink.h and linux/genetlink.h This is similar to netlink.h, but for netlink.h both contain good amount of code. For genetlink.h the linux/ version is leftover from before uAPI headers were split out, it has 10 lines of code. Move those 10 lines into other appropriate headers and delete linux/genetlink.h. I occasionally open the wrong header in the editor when coding, I guess I'm not the only one. v2: https://lore.kernel.org/all/20240325173716.2390605-1-kuba@kernel.org/ v1: https://lore.kernel.org/all/20240309183458.3014713-1-kuba@kernel.org ==================== Link: https://lore.kernel.org/r/20240329175710.291749-1-kuba@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
commit
edaa34e68c
11 changed files with 26 additions and 27 deletions
|
@ -14,7 +14,7 @@
|
|||
|
||||
#include <linux/init.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/genetlink.h>
|
||||
#include <net/genetlink.h>
|
||||
#include <net/rtnetlink.h>
|
||||
|
||||
static int __init wg_mod_init(void)
|
||||
|
|
|
@ -1,19 +0,0 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
#ifndef __LINUX_GENERIC_NETLINK_H
|
||||
#define __LINUX_GENERIC_NETLINK_H
|
||||
|
||||
#include <uapi/linux/genetlink.h>
|
||||
|
||||
|
||||
/* All generic netlink requests are serialized by a global lock. */
|
||||
extern void genl_lock(void);
|
||||
extern void genl_unlock(void);
|
||||
|
||||
/* for synchronisation between af_netlink and genetlink */
|
||||
extern atomic_t genl_sk_destructing_cnt;
|
||||
extern wait_queue_head_t genl_sk_destructing_waitq;
|
||||
|
||||
#define MODULE_ALIAS_GENL_FAMILY(family)\
|
||||
MODULE_ALIAS_NET_PF_PROTO_NAME(PF_NETLINK, NETLINK_GENERIC, "-family-" family)
|
||||
|
||||
#endif /* __LINUX_GENERIC_NETLINK_H */
|
|
@ -15,8 +15,8 @@
|
|||
#endif
|
||||
|
||||
#include <linux/args.h>
|
||||
#include <linux/genetlink.h>
|
||||
#include <linux/types.h>
|
||||
#include <net/genetlink.h>
|
||||
|
||||
extern int CONCATENATE(GENL_MAGIC_FAMILY, _genl_register)(void);
|
||||
extern void CONCATENATE(GENL_MAGIC_FAMILY, _genl_unregister)(void);
|
||||
|
|
|
@ -2,12 +2,20 @@
|
|||
#ifndef __NET_GENERIC_NETLINK_H
|
||||
#define __NET_GENERIC_NETLINK_H
|
||||
|
||||
#include <linux/genetlink.h>
|
||||
#include <linux/net.h>
|
||||
#include <net/netlink.h>
|
||||
#include <net/net_namespace.h>
|
||||
#include <uapi/linux/genetlink.h>
|
||||
|
||||
#define GENLMSG_DEFAULT_SIZE (NLMSG_DEFAULT_SIZE - GENL_HDRLEN)
|
||||
|
||||
/* Non-parallel generic netlink requests are serialized by a global lock. */
|
||||
void genl_lock(void);
|
||||
void genl_unlock(void);
|
||||
|
||||
#define MODULE_ALIAS_GENL_FAMILY(family) \
|
||||
MODULE_ALIAS_NET_PF_PROTO_NAME(PF_NETLINK, NETLINK_GENERIC, "-family-" family)
|
||||
|
||||
/* Binding to multicast group requires %CAP_NET_ADMIN */
|
||||
#define GENL_MCAST_CAP_NET_ADMIN BIT(0)
|
||||
/* Binding to multicast group requires %CAP_SYS_ADMIN */
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
#include <linux/crc32c.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/genetlink.h>
|
||||
#include <linux/gfp.h>
|
||||
#include <linux/if_ether.h>
|
||||
#include <linux/if_vlan.h>
|
||||
|
@ -38,6 +37,7 @@
|
|||
#include <linux/string.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <net/dsfield.h>
|
||||
#include <net/genetlink.h>
|
||||
#include <net/rtnetlink.h>
|
||||
#include <uapi/linux/batadv_packet.h>
|
||||
#include <uapi/linux/batman_adv.h>
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
#include <linux/cache.h>
|
||||
#include <linux/err.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/genetlink.h>
|
||||
#include <linux/gfp.h>
|
||||
#include <linux/if_ether.h>
|
||||
#include <linux/if_vlan.h>
|
||||
|
|
|
@ -59,7 +59,6 @@
|
|||
#include <linux/rhashtable.h>
|
||||
#include <asm/cacheflush.h>
|
||||
#include <linux/hash.h>
|
||||
#include <linux/genetlink.h>
|
||||
#include <linux/net_namespace.h>
|
||||
#include <linux/nospec.h>
|
||||
#include <linux/btf_ids.h>
|
||||
|
@ -73,6 +72,7 @@
|
|||
#include <trace/events/netlink.h>
|
||||
|
||||
#include "af_netlink.h"
|
||||
#include "genetlink.h"
|
||||
|
||||
struct listeners {
|
||||
struct rcu_head rcu;
|
||||
|
|
|
@ -22,6 +22,8 @@
|
|||
#include <net/sock.h>
|
||||
#include <net/genetlink.h>
|
||||
|
||||
#include "genetlink.h"
|
||||
|
||||
static DEFINE_MUTEX(genl_mutex); /* serialization of message processing */
|
||||
static DECLARE_RWSEM(cb_lock);
|
||||
|
||||
|
|
11
net/netlink/genetlink.h
Normal file
11
net/netlink/genetlink.h
Normal file
|
@ -0,0 +1,11 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
#ifndef __NET_GENETLINK_H
|
||||
#define __NET_GENETLINK_H
|
||||
|
||||
#include <linux/wait.h>
|
||||
|
||||
/* for synchronisation between af_netlink and genetlink */
|
||||
extern atomic_t genl_sk_destructing_cnt;
|
||||
extern wait_queue_head_t genl_sk_destructing_waitq;
|
||||
|
||||
#endif /* __LINUX_GENERIC_NETLINK_H */
|
|
@ -15,7 +15,6 @@
|
|||
#include <linux/delay.h>
|
||||
#include <linux/time.h>
|
||||
#include <linux/etherdevice.h>
|
||||
#include <linux/genetlink.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/kthread.h>
|
||||
#include <linux/mutex.h>
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
#include <linux/kernel.h>
|
||||
#include <linux/netlink.h>
|
||||
#include <linux/openvswitch.h>
|
||||
#include <linux/genetlink.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/bits.h>
|
||||
|
||||
|
|
Loading…
Reference in a new issue