Commit 92c14d9b authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

genetlink: simplify genl_notify 



The genl_notify function has too many arguments for no real reason - all
callers use genl_info to get them anyway. Just pass the genl_info down to
genl_notify.

Signed-off-by: default avatarJiri Benc <jbenc@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 06e60e59

drivers/net/wireless/mac80211_hwsim.c

+2 −3
Original line number Diff line number Diff line
@@ -2190,9 +2190,8 @@ static void hwsim_mcast_config_msg(struct sk_buff *mcast_skb, 
				   struct genl_info *info)

{

	if (info)

		genl_notify(&hwsim_genl_family, mcast_skb,

			    genl_info_net(info), info->snd_portid,

			    HWSIM_MCGRP_CONFIG, info->nlhdr, GFP_KERNEL);

		genl_notify(&hwsim_genl_family, mcast_skb, info,

			    HWSIM_MCGRP_CONFIG, GFP_KERNEL);

	else

		genlmsg_multicast(&hwsim_genl_family, mcast_skb, 0,

				  HWSIM_MCGRP_CONFIG, GFP_KERNEL);

include/net/genetlink.h

+2 −3
Original line number Diff line number Diff line
@@ -183,9 +183,8 @@ _genl_register_family_with_ops_grps(struct genl_family *family, 
					    (grps), ARRAY_SIZE(grps))



int genl_unregister_family(struct genl_family *family);

void genl_notify(struct genl_family *family,

		 struct sk_buff *skb, struct net *net, u32 portid,

		 u32 group, struct nlmsghdr *nlh, gfp_t flags);

void genl_notify(struct genl_family *family, struct sk_buff *skb,

		 struct genl_info *info, u32 group, gfp_t flags);



struct sk_buff *genlmsg_new_unicast(size_t payload, struct genl_info *info,

				    gfp_t flags);

net/netlink/genetlink.c

+6 −6
Original line number Diff line number Diff line
@@ -1136,19 +1136,19 @@ int genlmsg_multicast_allns(struct genl_family *family, struct sk_buff *skb, 
}

EXPORT_SYMBOL(genlmsg_multicast_allns);



void genl_notify(struct genl_family *family,

		 struct sk_buff *skb, struct net *net, u32 portid, u32 group,

		 struct nlmsghdr *nlh, gfp_t flags)

void genl_notify(struct genl_family *family, struct sk_buff *skb,

		 struct genl_info *info, u32 group, gfp_t flags)

{

	struct net *net = genl_info_net(info);

	struct sock *sk = net->genl_sock;

	int report = 0;



	if (nlh)

		report = nlmsg_report(nlh);

	if (info->nlhdr)

		report = nlmsg_report(info->nlhdr);



	if (WARN_ON_ONCE(group >= family->n_mcgrps))

		return;

	group = family->mcgrp_offset + group;

	nlmsg_notify(sk, skb, portid, group, report, flags);

	nlmsg_notify(sk, skb, info->snd_portid, group, report, flags);

}

EXPORT_SYMBOL(genl_notify);

net/openvswitch/datapath.c

+1 −2
Original line number Diff line number Diff line
@@ -91,8 +91,7 @@ static bool ovs_must_notify(struct genl_family *family, struct genl_info *info, 
static void ovs_notify(struct genl_family *family,

		       struct sk_buff *skb, struct genl_info *info)

{

	genl_notify(family, skb, genl_info_net(info), info->snd_portid,

		    0, info->nlhdr, GFP_KERNEL);

	genl_notify(family, skb, info, 0, GFP_KERNEL);

}



/**