| Message ID | 20240309183458.3014713-4-kuba@kernel.org |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | None | expand |
On Saturday, 9 March 2024 19:34:58 CET Jakub Kicinski wrote: > 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. > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> [...] > diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c > index 75119f1ffccc..8e0f44c71696 100644 > --- a/net/batman-adv/main.c > +++ b/net/batman-adv/main.c > @@ -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> > diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c > index 0954757f0b8b..9362cd9d6f3d 100644 > --- a/net/batman-adv/netlink.c > +++ b/net/batman-adv/netlink.c > @@ -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> Acked-by: Sven Eckelmann <sven@narfation.org> Kind regards, Sven
On Sat, Mar 09, 2024 at 10:34:58AM -0800, Jakub Kicinski wrote: > 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. ... > +/* All generic netlink requests are serialized by a global lock. */ > +extern void genl_lock(void); > +extern void genl_unlock(void); Do you need to inherit unneeded 'extern' here? ... > +#define MODULE_ALIAS_GENL_FAMILY(family) \ > + MODULE_ALIAS_NET_PF_PROTO_NAME(PF_NETLINK, NETLINK_GENERIC, "-family-" family) This is using the macro defined in net.h which seems not being included.
diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c index ee4da9ab8013..a00671b58701 100644 --- a/drivers/net/wireguard/main.c +++ b/drivers/net/wireguard/main.c @@ -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) diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h deleted file mode 100644 index 9dbd7ba9b858..000000000000 --- a/include/linux/genetlink.h +++ /dev/null @@ -1,14 +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); - -#define MODULE_ALIAS_GENL_FAMILY(family)\ - MODULE_ALIAS_NET_PF_PROTO_NAME(PF_NETLINK, NETLINK_GENERIC, "-family-" family) - -#endif /* __LINUX_GENERIC_NETLINK_H */ diff --git a/include/linux/genl_magic_struct.h b/include/linux/genl_magic_struct.h index a419d93789ff..621b87a87d74 100644 --- a/include/linux/genl_magic_struct.h +++ b/include/linux/genl_magic_struct.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); diff --git a/include/net/genetlink.h b/include/net/genetlink.h index 9ece6e5a3ea8..090aa3e36ce3 100644 --- a/include/net/genetlink.h +++ b/include/net/genetlink.h @@ -2,12 +2,19 @@ #ifndef __NET_GENERIC_NETLINK_H #define __NET_GENERIC_NETLINK_H -#include <linux/genetlink.h> +#include <uapi/linux/genetlink.h> #include <net/netlink.h> #include <net/net_namespace.h> #define GENLMSG_DEFAULT_SIZE (NLMSG_DEFAULT_SIZE - GENL_HDRLEN) +/* 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) + /* Binding to multicast group requires %CAP_NET_ADMIN */ #define GENL_MCAST_CAP_NET_ADMIN BIT(0) /* Binding to multicast group requires %CAP_SYS_ADMIN */ diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 75119f1ffccc..8e0f44c71696 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -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> diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 0954757f0b8b..9362cd9d6f3d 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -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> diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 11c69415c605..99d72543abd3 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -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>
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. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- CC: Jason@zx2c4.com CC: mareklindner@neomailbox.ch CC: sw@simonwunderlich.de CC: a@unstable.cc CC: sven@narfation.org CC: pshelar@ovn.org CC: andriy.shevchenko@linux.intel.com CC: wireguard@lists.zx2c4.com CC: dev@openvswitch.org --- drivers/net/wireguard/main.c | 2 +- include/linux/genetlink.h | 14 -------------- include/linux/genl_magic_struct.h | 2 +- include/net/genetlink.h | 9 ++++++++- net/batman-adv/main.c | 2 +- net/batman-adv/netlink.c | 1 - net/openvswitch/datapath.c | 1 - 7 files changed, 11 insertions(+), 20 deletions(-) delete mode 100644 include/linux/genetlink.h