diff options
| author | Jiri Benc <jbenc@redhat.com> | 2015-09-22 18:56:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-24 12:25:23 -0700 |
| commit | 92c14d9b5ee86fd6cf136c01b6a87353522aebdd (patch) | |
| tree | 06a095b1c2f948b3a045e12406b0ca8020c20bf5 /net | |
| parent | 06e60e5912c0373b15143cc52e4a11fafeaafff3 (diff) | |
| download | op-kernel-dev-92c14d9b5ee86fd6cf136c01b6a87353522aebdd.zip op-kernel-dev-92c14d9b5ee86fd6cf136c01b6a87353522aebdd.tar.gz | |
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: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netlink/genetlink.c | 12 | ||||
| -rw-r--r-- | net/openvswitch/datapath.c | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c index 2ed5f96..75724a9 100644 --- a/net/netlink/genetlink.c +++ b/net/netlink/genetlink.c @@ -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); diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 6fbd2de..2913594 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -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); } /** |
