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

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

genetlink: pass family to functions using groups 



This doesn't really change anything, but prepares for the
next patch that will change the APIs to pass the group ID
within the family, rather than the global group ID.

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

drivers/acpi/event.c

+2 −1
Original line number Diff line number Diff line
@@ -146,7 +146,8 @@ int acpi_bus_generate_netlink_event(const char *device_class, 
		return result;

	}



	genlmsg_multicast(skb, 0, acpi_event_mcgrp.id, GFP_ATOMIC);

	genlmsg_multicast(&acpi_event_genl_family,

			  skb, 0, acpi_event_mcgrp.id, GFP_ATOMIC);

	return 0;

}

drivers/net/team/team.c

+3 −2
Original line number Diff line number Diff line
@@ -2677,8 +2677,9 @@ static struct genl_multicast_group team_change_event_mcgrp = { 
static int team_nl_send_multicast(struct sk_buff *skb,

				  struct team *team, u32 portid)

{

	return genlmsg_multicast_netns(dev_net(team->dev), skb, 0,

				       team_change_event_mcgrp.id, GFP_KERNEL);

	return genlmsg_multicast_netns(&team_nl_family, dev_net(team->dev),

				       skb, 0, team_change_event_mcgrp.id,

				       GFP_KERNEL);

}



static int team_nl_send_event_options_get(struct team *team,

drivers/scsi/pmcraid.c

+2 −1
Original line number Diff line number Diff line
@@ -1512,7 +1512,8 @@ static int pmcraid_notify_aen( 
	}



	result =

		genlmsg_multicast(skb, 0, pmcraid_event_family.id, GFP_ATOMIC);

		genlmsg_multicast(&pmcraid_event_family, skb, 0,

				  pmcraid_event_family.id, GFP_ATOMIC);



	/* If there are no listeners, genlmsg_multicast may return non-zero

	 * value.

drivers/thermal/thermal_core.c

+2 −1
Original line number Diff line number Diff line
@@ -1675,7 +1675,8 @@ int thermal_generate_netlink_event(struct thermal_zone_device *tz, 
		return result;

	}



	result = genlmsg_multicast(skb, 0, thermal_event_mcgrp.id, GFP_ATOMIC);

	result = genlmsg_multicast(&thermal_event_genl_family, skb, 0,

				   thermal_event_mcgrp.id, GFP_ATOMIC);

	if (result)

		dev_err(&tz->device, "Failed to send netlink event:%d", result);

fs/quota/netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ void quota_send_warning(struct kqid qid, dev_t dev, 
		goto attr_err_out;

	genlmsg_end(skb, msg_head);



	genlmsg_multicast(skb, 0, quota_mcgrp.id, GFP_NOFS);

	genlmsg_multicast(&quota_genl_family, skb, 0, quota_mcgrp.id, GFP_NOFS);

	return;

attr_err_out:

	printk(KERN_ERR "VFS: Not enough space to compose quota message!\n");