Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac6d439d authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETLINK]: Convert netlink users to use group numbers instead of bitmasks 



Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d629b836

drivers/w1/w1_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg) 


	memcpy(data, msg, sizeof(struct w1_netlink_msg));



	NETLINK_CB(skb).dst_groups = dev->groups;

	NETLINK_CB(skb).dst_group = dev->groups;

	netlink_broadcast(dev->nls, skb, 0, dev->groups, GFP_ATOMIC);



nlmsg_failure:

include/linux/netfilter/nfnetlink.h

+22 −1
Original line number Diff line number Diff line
@@ -2,13 +2,34 @@ 
#define _NFNETLINK_H

#include <linux/types.h>



/* nfnetlink groups: Up to 32 maximum */

#ifndef __KERNEL__

/* nfnetlink groups: Up to 32 maximum - backwards compatibility for userspace */

#define NF_NETLINK_CONNTRACK_NEW 		0x00000001

#define NF_NETLINK_CONNTRACK_UPDATE		0x00000002

#define NF_NETLINK_CONNTRACK_DESTROY		0x00000004

#define NF_NETLINK_CONNTRACK_EXP_NEW		0x00000008

#define NF_NETLINK_CONNTRACK_EXP_UPDATE		0x00000010

#define NF_NETLINK_CONNTRACK_EXP_DESTROY	0x00000020

#endif



enum nfnetlink_groups {

	NFNLGRP_NONE,

#define NFNLGRP_NONE			NFNLGRP_NONE

	NFNLGRP_CONNTRACK_NEW,

#define NFNLGRP_CONNTRACK_NEW		NFNLGRP_CONNTRACK_NEW

	NFNLGRP_CONNTRACK_UPDATE,

#define NFNLGRP_CONNTRACK_UPDATE	NFNLGRP_CONNTRACK_UPDATE

	NFNLGRP_CONNTRACK_DESTROY,

#define NFNLGRP_CONNTRACK_DESTROY	NFNLGRP_CONNTRACK_DESTROY

	NFNLGRP_CONNTRACK_EXP_NEW,

#define	NFNLGRP_CONNTRACK_EXP_NEW	NFNLGRP_CONNTRACK_EXP_NEW

	NFNLGRP_CONNTRACK_EXP_UPDATE,

#define NFNLGRP_CONNTRACK_EXP_UPDATE	NFNLGRP_CONNTRACK_EXP_UPDATE

	NFNLGRP_CONNTRACK_EXP_DESTROY,

#define NFNLGRP_CONNTRACK_EXP_DESTROY	NFNLGRP_CONNTRACK_EXP_DESTROY

	__NFNLGRP_MAX,

};

#define NFNLGRP_MAX	(__NFNLGRP_MAX - 1)



/* Generic structure for encapsulation optional netfilter information.

 * It is reminiscent of sockaddr, but with sa_family replaced

include/linux/netfilter_decnet.h

+14 −0
Original line number Diff line number Diff line
@@ -56,7 +56,21 @@ struct nf_dn_rtmsg { 


#define NFDN_RTMSG(r) ((unsigned char *)(r) + NLMSG_ALIGN(sizeof(struct nf_dn_rtmsg)))



#ifndef __KERNEL__

/* backwards compatibility for userspace */

#define DNRMG_L1_GROUP 0x01

#define DNRMG_L2_GROUP 0x02

#endif



enum {

	DNRNG_NLGRP_NONE,

#define DNRNG_NLGRP_NONE	DNRNG_NLGRP_NONE

	DNRNG_NLGRP_L1,

#define DNRNG_NLGRP_L1		DNRNG_NLGRP_L1

	DNRNG_NLGRP_L2,

#define DNRNG_NLGRP_L2		DNRNG_NLGRP_L2

	__DNRNG_NLGRP_MAX

};

#define DNRNG_NLGRP_MAX	(__DNRNG_NLGRP_MAX - 1)



#endif /*__LINUX_DECNET_NETFILTER_H*/

include/linux/rtnetlink.h

+39 −3
Original line number Diff line number Diff line
@@ -826,9 +826,8 @@ enum 
#define TCA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct tcmsg))))

#define TCA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcmsg))





/* RTnetlink multicast groups */



#ifndef __KERNEL__

/* RTnetlink multicast groups - backwards compatibility for userspace */

#define RTMGRP_LINK		1

#define RTMGRP_NOTIFY		2

#define RTMGRP_NEIGH		4
@@ -847,6 +846,43 @@ enum 
#define RTMGRP_DECnet_ROUTE     0x4000



#define RTMGRP_IPV6_PREFIX	0x20000

#endif



/* RTnetlink multicast groups */

enum rtnetlink_groups {

	RTNLGRP_NONE,

#define RTNLGRP_NONE		RTNLGRP_NONE

	RTNLGRP_LINK,

#define RTNLGRP_LINK		RTNLGRP_LINK

	RTNLGRP_NOTIFY,

#define RTNLGRP_NOTIFY		RTNLGRP_NOTIFY

	RTNLGRP_NEIGH,

#define RTNLGRP_NEIGH		RTNLGRP_NEIGH

	RTNLGRP_TC,

#define RTNLGRP_TC		RTNLGRP_TC

	RTNLGRP_IPV4_IFADDR,

#define RTNLGRP_IPV4_IFADDR	RTNLGRP_IPV4_IFADDR

	RTNLGRP_IPV4_MROUTE,

#define	RTNLGRP_IPV4_MROUTE	RTNLGRP_IPV4_MROUTE

	RTNLGRP_IPV4_ROUTE,

#define RTNLGRP_IPV4_ROUTE	RTNLGRP_IPV4_ROUTE

	RTNLGRP_IPV6_IFADDR,

#define RTNLGRP_IPV6_IFADDR	RTNLGRP_IPV6_IFADDR

	RTNLGRP_IPV6_MROUTE,

#define RTNLGRP_IPV6_MROUTE	RTNLGRP_IPV6_MROUTE

	RTNLGRP_IPV6_ROUTE,

#define RTNLGRP_IPV6_ROUTE	RTNLGRP_IPV6_ROUTE

	RTNLGRP_IPV6_IFINFO,

#define RTNLGRP_IPV6_IFINFO	RTNLGRP_IPV6_IFINFO

	RTNLGRP_DECnet_IFADDR,

#define RTNLGRP_DECnet_IFADDR	RTNLGRP_DECnet_IFADDR

	RTNLGRP_DECnet_ROUTE,

#define RTNLGRP_DECnet_ROUTE	RTNLGRP_DECnet_ROUTE

	RTNLGRP_IPV6_PREFIX,

#define RTNLGRP_IPV6_PREFIX	RTNLGRP_IPV6_PREFIX

	__RTNLGRP_MAX

};

#define RTNLGRP_MAX	(__RTNLGRP_MAX - 1)



/* TC action piece */

struct tcamsg

include/linux/selinux_netlink.h

+12 −1
Original line number Diff line number Diff line
@@ -20,10 +20,21 @@ enum { 
	SELNL_MSG_MAX

};



/* Multicast groups */

#ifndef __KERNEL__

/* Multicast groups - backwards compatiblility for userspace */

#define SELNL_GRP_NONE		0x00000000

#define SELNL_GRP_AVC		0x00000001	/* AVC notifications */

#define SELNL_GRP_ALL		0xffffffff

#endif



enum selinux_nlgroups {

	SELNLGRP_NONE,

#define SELNLGRP_NONE	SELNLGRP_NONE

	SELNLGRP_AVC,

#define SELNLGRP_AVC	SELNLGRP_AVC

	__SELNLGRP_MAX

};

#define SELNLGRP_MAX	(__SELNLGRP_MAX - 1)



/* Message structures */

struct selnl_msg_setenforce {