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

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: default avatarJakub Kicinski <kuba@kernel.org>
parents 092ca107 cd720962

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/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>

net/batman-adv/netlink.c

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