tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
genetlink: remove linux/genetlink.h
genetlink.h is a shell of what used to be a combined uAPI
and kernel header over a decade ago. It has fewer than
10 lines of code. Merge it into net/genetlink.h.
In some ways it'd be better to keep the combined header
under linux/ but it would make looking through git history
harder.
Acked-by: Sven Eckelmann <sven@narfation.org>
Link: https://lore.kernel.org/r/20240329175710.291749-4-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+12
-20
+1
-1
drivers/net/wireguard/main.c
+1
-1
drivers/net/wireguard/main.c
-14
include/linux/genetlink.h
-14
include/linux/genetlink.h
···
1
-
/* SPDX-License-Identifier: GPL-2.0 */
2
-
#ifndef __LINUX_GENERIC_NETLINK_H
3
-
#define __LINUX_GENERIC_NETLINK_H
4
-
5
-
#include <uapi/linux/genetlink.h>
6
-
7
-
/* All generic netlink requests are serialized by a global lock. */
8
-
extern void genl_lock(void);
9
-
extern void genl_unlock(void);
10
-
11
-
#define MODULE_ALIAS_GENL_FAMILY(family)\
12
-
MODULE_ALIAS_NET_PF_PROTO_NAME(PF_NETLINK, NETLINK_GENERIC, "-family-" family)
13
-
14
-
#endif /* __LINUX_GENERIC_NETLINK_H */
+1
-1
include/linux/genl_magic_struct.h
+1
-1
include/linux/genl_magic_struct.h
···
15
15
#endif
16
16
17
17
#include <linux/args.h>
18
-
#include <linux/genetlink.h>
19
18
#include <linux/types.h>
19
+
#include <net/genetlink.h>
20
20
21
21
extern int CONCATENATE(GENL_MAGIC_FAMILY, _genl_register)(void);
22
22
extern void CONCATENATE(GENL_MAGIC_FAMILY, _genl_unregister)(void);
+9
-1
include/net/genetlink.h
+9
-1
include/net/genetlink.h
···
2
2
#ifndef __NET_GENERIC_NETLINK_H
3
3
#define __NET_GENERIC_NETLINK_H
4
4
5
-
#include <linux/genetlink.h>
5
+
#include <linux/net.h>
6
6
#include <net/netlink.h>
7
7
#include <net/net_namespace.h>
8
+
#include <uapi/linux/genetlink.h>
8
9
9
10
#define GENLMSG_DEFAULT_SIZE (NLMSG_DEFAULT_SIZE - GENL_HDRLEN)
11
+
12
+
/* Non-parallel generic netlink requests are serialized by a global lock. */
13
+
void genl_lock(void);
14
+
void genl_unlock(void);
15
+
16
+
#define MODULE_ALIAS_GENL_FAMILY(family) \
17
+
MODULE_ALIAS_NET_PF_PROTO_NAME(PF_NETLINK, NETLINK_GENERIC, "-family-" family)
10
18
11
19
/* Binding to multicast group requires %CAP_NET_ADMIN */
12
20
#define GENL_MCAST_CAP_NET_ADMIN BIT(0)
+1
-1
net/batman-adv/main.c
+1
-1
net/batman-adv/main.c
···
14
14
#include <linux/crc32c.h>
15
15
#include <linux/device.h>
16
16
#include <linux/errno.h>
17
-
#include <linux/genetlink.h>
18
17
#include <linux/gfp.h>
19
18
#include <linux/if_ether.h>
20
19
#include <linux/if_vlan.h>
···
37
38
#include <linux/string.h>
38
39
#include <linux/workqueue.h>
39
40
#include <net/dsfield.h>
41
+
#include <net/genetlink.h>
40
42
#include <net/rtnetlink.h>
41
43
#include <uapi/linux/batadv_packet.h>
42
44
#include <uapi/linux/batman_adv.h>
-1
net/batman-adv/netlink.c
-1
net/batman-adv/netlink.c