From 9a1866f183acbbc4943cde17e1438039299a851b Mon Sep 17 00:00:00 2001 From: Ignas Bacius Date: Wed, 4 Dec 2019 14:57:57 +0200 Subject: [PATCH] Fix to compile with kernel >= 5.2.0 --- srext/kernel/sr_genl.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/srext/kernel/sr_genl.c b/srext/kernel/sr_genl.c index 75d4514..060d5a4 100644 --- a/srext/kernel/sr_genl.c +++ b/srext/kernel/sr_genl.c @@ -41,15 +41,6 @@ char *err_str[] = {"SREXT answers: OK.", "SREXT answers: [ERROR]: Table doesn't exist." }; -static struct genl_family sr_gnl_family = { - //.id = GENL_ID_GENERATE, - //.id = 0, - .hdrsize = 0, - .name = SR_GNL_FAMILY_NAME, - .version = SR_GNL_FAMILY_VERSION, - .maxattr = SR_A_MAX, -}; - static struct nla_policy sr_genl_policy[_SR_A_MAX + 1] = { [SR_A_UNSPEC] = { .type = NLA_STRING }, [SR_A_TABLE] = { .type = NLA_STRING }, @@ -64,6 +55,16 @@ static struct nla_policy sr_genl_policy[_SR_A_MAX + 1] = { [SR_A_RESPONSE_LST] = { .type = NLA_STRING } }; +static struct genl_family sr_gnl_family = { + //.id = GENL_ID_GENERATE, + //.id = 0, + .hdrsize = 0, + .name = SR_GNL_FAMILY_NAME, + .version = SR_GNL_FAMILY_VERSION, + .maxattr = SR_A_MAX, + .policy = sr_genl_policy, +}; + static void set_msg_data(struct genl_msg_data *msg_data, int type, void *data, int len) { @@ -584,35 +585,30 @@ static struct genl_ops nvf_genl_ops[] = { { .cmd = SR_C_ADD, .flags = 0, - .policy = sr_genl_policy, .doit = sr_genl_dispatcher, .dumpit = NULL, }, { .cmd = SR_C_DEL, .flags = 0, - .policy = sr_genl_policy, .doit = sr_genl_dispatcher, .dumpit = NULL, }, { .cmd = SR_C_SHOW, .flags = 0, - .policy = sr_genl_policy, .doit = sr_genl_dispatcher, .dumpit = NULL, }, { .cmd = SR_C_FLUSH, .flags = 0, - .policy = sr_genl_policy, .doit = sr_genl_dispatcher, .dumpit = NULL, }, { .cmd = SR_C_CLEAR, .flags = 0, - .policy = sr_genl_policy, .doit = sr_genl_dispatcher, .dumpit = NULL, }