genetlink: statically initialize families
Instead of providing macros/inline functions to initialize the families, make all users initialize them statically and get rid of the macros. This reduces the kernel code size by about 1.6k on x86-64 (with allyesconfig). Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
a07ea4d994
commit
489111e5c2
@@ -2150,12 +2150,7 @@ static struct rtnl_link_ops team_link_ops __read_mostly = {
|
||||
* Generic netlink custom interface
|
||||
***********************************/
|
||||
|
||||
static struct genl_family team_nl_family = {
|
||||
.name = TEAM_GENL_NAME,
|
||||
.version = TEAM_GENL_VERSION,
|
||||
.maxattr = TEAM_ATTR_MAX,
|
||||
.netnsok = true,
|
||||
};
|
||||
static struct genl_family team_nl_family;
|
||||
|
||||
static const struct nla_policy team_nl_policy[TEAM_ATTR_MAX + 1] = {
|
||||
[TEAM_ATTR_UNSPEC] = { .type = NLA_UNSPEC, },
|
||||
@@ -2745,6 +2740,18 @@ static const struct genl_multicast_group team_nl_mcgrps[] = {
|
||||
{ .name = TEAM_GENL_CHANGE_EVENT_MC_GRP_NAME, },
|
||||
};
|
||||
|
||||
static struct genl_family team_nl_family = {
|
||||
.name = TEAM_GENL_NAME,
|
||||
.version = TEAM_GENL_VERSION,
|
||||
.maxattr = TEAM_ATTR_MAX,
|
||||
.netnsok = true,
|
||||
.module = THIS_MODULE,
|
||||
.ops = team_nl_ops,
|
||||
.n_ops = ARRAY_SIZE(team_nl_ops),
|
||||
.mcgrps = team_nl_mcgrps,
|
||||
.n_mcgrps = ARRAY_SIZE(team_nl_mcgrps),
|
||||
};
|
||||
|
||||
static int team_nl_send_multicast(struct sk_buff *skb,
|
||||
struct team *team, u32 portid)
|
||||
{
|
||||
@@ -2768,8 +2775,7 @@ static int team_nl_send_event_port_get(struct team *team,
|
||||
|
||||
static int team_nl_init(void)
|
||||
{
|
||||
return genl_register_family_with_ops_groups(&team_nl_family, team_nl_ops,
|
||||
team_nl_mcgrps);
|
||||
return genl_register_family(&team_nl_family);
|
||||
}
|
||||
|
||||
static void team_nl_fini(void)
|
||||
|
Reference in New Issue
Block a user