um: Correctly check for PTRACE_GETRESET/SETREGSET

[linux.git] / net / ipv4 / fou.c

diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
index 030d1531e897a14c44d6dbf04dc21df2c87da399..805f6607f8d9a89661bed62db6b370b964d43f1d 100644 (file)
--- a/net/ipv4/fou.c
+++ b/net/ipv4/fou.c
@@ -622,14 +622,7 @@ static int fou_destroy(struct net *net, struct fou_cfg *cfg)
        return err;
 }
 
-static struct genl_family fou_nl_family = {
-       .id             = GENL_ID_GENERATE,
-       .hdrsize        = 0,
-       .name           = FOU_GENL_NAME,
-       .version        = FOU_GENL_VERSION,
-       .maxattr        = FOU_ATTR_MAX,
-       .netnsok        = true,
-};
+static struct genl_family fou_nl_family;
 
 static const struct nla_policy fou_nl_policy[FOU_ATTR_MAX + 1] = {
        [FOU_ATTR_PORT] = { .type = NLA_U16, },
@@ -831,6 +824,17 @@ static const struct genl_ops fou_nl_ops[] = {
        },
 };
 
+static struct genl_family fou_nl_family __ro_after_init = {
+       .hdrsize        = 0,
+       .name           = FOU_GENL_NAME,
+       .version        = FOU_GENL_VERSION,
+       .maxattr        = FOU_ATTR_MAX,
+       .netnsok        = true,
+       .module         = THIS_MODULE,
+       .ops            = fou_nl_ops,
+       .n_ops          = ARRAY_SIZE(fou_nl_ops),
+};
+
 size_t fou_encap_hlen(struct ip_tunnel_encap *e)
 {
        return sizeof(struct udphdr);
@@ -1086,8 +1090,7 @@ static int __init fou_init(void)
        if (ret)
                goto exit;
 
-       ret = genl_register_family_with_ops(&fou_nl_family,
-                                           fou_nl_ops);
+       ret = genl_register_family(&fou_nl_family);
        if (ret < 0)
                goto unregister;