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

Commit a07ea4d9 authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

genetlink: no longer support using static family IDs 



Static family IDs have never really been used, the only
use case was the workaround I introduced for those users
that assumed their family ID was also their multicast
group ID.

Additionally, because static family IDs would never be
reserved by the generic netlink code, using a relatively
low ID would only work for built-in families that can be
registered immediately after generic netlink is started,
which is basically only the control family (apart from
the workaround code, which I also had to add code for so
it would reserve those IDs)

Thus, anything other than GENL_ID_GENERATE is flawed and
luckily not used except in the cases I mentioned. Move
those workarounds into a few lines of code, and then get
rid of GENL_ID_GENERATE entirely, making it more robust.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c90c39da

drivers/acpi/event.c

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ static const struct genl_multicast_group acpi_event_mcgrps[] = { 
};



static struct genl_family acpi_event_genl_family = {

	.id = GENL_ID_GENERATE,

	.name = ACPI_GENL_FAMILY_NAME,

	.version = ACPI_GENL_VERSION,

	.maxattr = ACPI_GENL_ATTR_MAX,

drivers/net/gtp.c

+0 −1
Original line number Diff line number Diff line
@@ -1095,7 +1095,6 @@ static int gtp_genl_del_pdp(struct sk_buff *skb, struct genl_info *info) 
}



static struct genl_family gtp_genl_family = {

	.id		= GENL_ID_GENERATE,

	.name		= "gtp",

	.version	= 0,

	.hdrsize	= 0,

drivers/net/macsec.c

+0 −1
Original line number Diff line number Diff line
@@ -1422,7 +1422,6 @@ static void clear_tx_sa(struct macsec_tx_sa *tx_sa) 
}



static struct genl_family macsec_fam = {

	.id		= GENL_ID_GENERATE,

	.name		= MACSEC_GENL_NAME,

	.hdrsize	= 0,

	.version	= MACSEC_GENL_VERSION,

drivers/net/team/team.c

+0 −1
Original line number Diff line number Diff line
@@ -2151,7 +2151,6 @@ static struct rtnl_link_ops team_link_ops __read_mostly = { 
 ***********************************/



static struct genl_family team_nl_family = {

	.id		= GENL_ID_GENERATE,

	.name		= TEAM_GENL_NAME,

	.version	= TEAM_GENL_VERSION,

	.maxattr	= TEAM_ATTR_MAX,

drivers/net/wireless/mac80211_hwsim.c

+0 −1
Original line number Diff line number Diff line
@@ -589,7 +589,6 @@ struct hwsim_radiotap_ack_hdr { 


/* MAC80211_HWSIM netlinf family */

static struct genl_family hwsim_genl_family = {

	.id = GENL_ID_GENERATE,

	.hdrsize = 0,

	.name = "MAC80211_HWSIM",

	.version = 1,