Merge tag 'asoc-fix-v5.14-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / net / l2tp / l2tp_ip.c

diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index 97ae125..b3edafa 100644 (file)
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
@@ -488,7 +488,7 @@ static int l2tp_ip_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
                }
        }
 
-       /* We dont need to clone dst here, it is guaranteed to not disappear.
+       /* We don't need to clone dst here, it is guaranteed to not disappear.
         *  __dev_xmit_skb() might force a refcount if needed.
         */
        skb_dst_set_noref(skb, &rt->dst);
@@ -635,7 +635,6 @@ static struct inet_protosw l2tp_ip_protosw = {
 
 static struct net_protocol l2tp_ip_protocol __read_mostly = {
        .handler        = l2tp_ip_recv,
-       .netns_ok       = 1,
 };
 
 static int __init l2tp_ip_init(void)