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

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

genetlink: pass only network namespace to genl_has_listeners() 



There's no point to force the caller to know about the internal
genl_sock to use inside struct net, just have them pass the network
namespace. This doesn't really change code generation since it's
an inline, but makes the caller less magic - there's never any
reason to pass another socket.

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

include/net/genetlink.h

+2 −2
Original line number Diff line number Diff line
@@ -395,11 +395,11 @@ static inline int genl_set_err(struct genl_family *family, struct net *net, 
}



static inline int genl_has_listeners(struct genl_family *family,

				     struct sock *sk, unsigned int group)

				     struct net *net, unsigned int group)

{

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

		return -EINVAL;

	group = family->mcgrp_offset + group;

	return netlink_has_listeners(sk, group);

	return netlink_has_listeners(net->genl_sock, group);

}

#endif	/* __NET_GENERIC_NETLINK_H */

net/openvswitch/datapath.c

+1 −2
Original line number Diff line number Diff line
@@ -83,8 +83,7 @@ static bool ovs_must_notify(struct genl_family *family, struct genl_info *info, 
			    unsigned int group)

{

	return info->nlhdr->nlmsg_flags & NLM_F_ECHO ||

	       genl_has_listeners(family, genl_info_net(info)->genl_sock,

				  group);

	       genl_has_listeners(family, genl_info_net(info), group);

}



static void ovs_notify(struct genl_family *family,