diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-12-22 12:56:36 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-27 02:20:23 -0500 |
| commit | f8403a2e47afb37bcd3b7e286996d138a116c39d (patch) | |
| tree | 4c3205b1d191df99969386bd52ef1ee25911a508 /include/net | |
| parent | 02c81ab95d8718d75886d16227a10cc7774493ea (diff) | |
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: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/genetlink.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/genetlink.h b/include/net/genetlink.h index af10c2cf8a1d..38620da4aa7a 100644 --- a/include/net/genetlink.h +++ b/include/net/genetlink.h | |||
| @@ -395,11 +395,11 @@ static inline int genl_set_err(struct genl_family *family, struct net *net, | |||
| 395 | } | 395 | } |
| 396 | 396 | ||
| 397 | static inline int genl_has_listeners(struct genl_family *family, | 397 | static inline int genl_has_listeners(struct genl_family *family, |
| 398 | struct sock *sk, unsigned int group) | 398 | struct net *net, unsigned int group) |
| 399 | { | 399 | { |
| 400 | if (WARN_ON_ONCE(group >= family->n_mcgrps)) | 400 | if (WARN_ON_ONCE(group >= family->n_mcgrps)) |
| 401 | return -EINVAL; | 401 | return -EINVAL; |
| 402 | group = family->mcgrp_offset + group; | 402 | group = family->mcgrp_offset + group; |
| 403 | return netlink_has_listeners(sk, group); | 403 | return netlink_has_listeners(net->genl_sock, group); |
| 404 | } | 404 | } |
| 405 | #endif /* __NET_GENERIC_NETLINK_H */ | 405 | #endif /* __NET_GENERIC_NETLINK_H */ |
