Merge tag 'locking-urgent-2021-05-09' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / net / ipv4 / fou.c

diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
index abd0834..e5f69b0 100644 (file)
--- a/net/ipv4/fou.c
+++ b/net/ipv4/fou.c
@@ -237,7 +237,7 @@ static struct sk_buff *fou_gro_receive(struct sock *sk,
 
        /* We can clear the encap_mark for FOU as we are essentially doing
         * one of two possible things.  We are either adding an L4 tunnel
-        * header to the outer L3 tunnel header, or we are are simply
+        * header to the outer L3 tunnel header, or we are simply
         * treating the GRE tunnel header as though it is a UDP protocol
         * specific header such as VXLAN or GENEVE.
         */
@@ -429,7 +429,7 @@ next_proto:
 
        /* We can clear the encap_mark for GUE as we are essentially doing
         * one of two possible things.  We are either adding an L4 tunnel
-        * header to the outer L3 tunnel header, or we are are simply
+        * header to the outer L3 tunnel header, or we are simply
         * treating the GRE tunnel header as though it is a UDP protocol
         * specific header such as VXLAN or GENEVE.
         */
@@ -911,7 +911,7 @@ static int fou_nl_dump(struct sk_buff *skb, struct netlink_callback *cb)
        return skb->len;
 }
 
-static const struct genl_ops fou_nl_ops[] = {
+static const struct genl_small_ops fou_nl_ops[] = {
        {
                .cmd = FOU_CMD_ADD,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
@@ -940,8 +940,8 @@ static struct genl_family fou_nl_family __ro_after_init = {
        .policy = fou_nl_policy,
        .netnsok        = true,
        .module         = THIS_MODULE,
-       .ops            = fou_nl_ops,
-       .n_ops          = ARRAY_SIZE(fou_nl_ops),
+       .small_ops      = fou_nl_ops,
+       .n_small_ops    = ARRAY_SIZE(fou_nl_ops),
 };
 
 size_t fou_encap_hlen(struct ip_tunnel_encap *e)