Commit cd720962 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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: default avatarSven Eckelmann <sven@narfation.org>
Link: https://lore.kernel.org/r/20240329175710.291749-4-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f97c9b53

drivers/net/wireguard/main.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

include/linux/genetlink.h

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
/* 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);



#define MODULE_ALIAS_GENL_FAMILY(family)\

 MODULE_ALIAS_NET_PF_PROTO_NAME(PF_NETLINK, NETLINK_GENERIC, "-family-" family)



#endif	/* __LINUX_GENERIC_NETLINK_H */

include/linux/genl_magic_struct.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/net/genetlink.h

+9 −1
Original line number Diff line number Diff line
@@ -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 */

net/batman-adv/main.c

+1 −1
Original line number Diff line number Diff line
@@ -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>