Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux.git] / drivers / net / gtp.c

diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c
index 7a145172d50385f56f54e4b114ab6194fd672ca5..eaf4311b4004e6513d0b4a4a299724d78a9a8efd 100644 (file)
--- a/drivers/net/gtp.c
+++ b/drivers/net/gtp.c
@@ -1270,21 +1270,21 @@ static const struct nla_policy gtp_genl_policy[GTPA_MAX + 1] = {
 static const struct genl_ops gtp_genl_ops[] = {
        {
                .cmd = GTP_CMD_NEWPDP,
+               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
                .doit = gtp_genl_new_pdp,
-               .policy = gtp_genl_policy,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = GTP_CMD_DELPDP,
+               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
                .doit = gtp_genl_del_pdp,
-               .policy = gtp_genl_policy,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = GTP_CMD_GETPDP,
+               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
                .doit = gtp_genl_get_pdp,
                .dumpit = gtp_genl_dump_pdp,
-               .policy = gtp_genl_policy,
                .flags = GENL_ADMIN_PERM,
        },
 };
@@ -1294,6 +1294,7 @@ static struct genl_family gtp_genl_family __ro_after_init = {
        .version        = 0,
        .hdrsize        = 0,
        .maxattr        = GTPA_MAX,
+       .policy = gtp_genl_policy,
        .netnsok        = true,
        .module         = THIS_MODULE,
        .ops            = gtp_genl_ops,