From patchwork Tue Jan 28 14:07:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 232632 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB9F0C2D0DB for ; Tue, 28 Jan 2020 14:27:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 75ABA24688 for ; Tue, 28 Jan 2020 14:27:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221631; bh=LUO6G6Vud2lDgginDRGBBVIN5xR5pPgeY524ofnipcQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kBNMSevXFMkg9l2Td3Aoeqv8S/y6fYXO5OjbnuSH4UPHV7pHhJVDJfGCqm+ZVbrG/ yAaS5Bbay89VkIAEA3lL0oSwUUxOaeyq5lU1gItZARzQS0aGU2XOCHtiep9AQhDjPo AR3Z3ZQuK15j5WL1wPnnxoq4OCBUp0drrh6KsoqA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733264AbgA1O1E (ORCPT ); Tue, 28 Jan 2020 09:27:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:54692 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733255AbgA1O1D (ORCPT ); Tue, 28 Jan 2020 09:27:03 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4EDCF2468A; Tue, 28 Jan 2020 14:27:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221622; bh=LUO6G6Vud2lDgginDRGBBVIN5xR5pPgeY524ofnipcQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qw+Vjzhtmi1eoWWqvkC1KDYJVDSdMVqPSxKEJfHrRLXv6NSTFJbfOd+zVIfS0SY70 ewika4l0OwjwdCmYAGRiDJeRTgc8wJJRkExiLK6dQkHPMoNbGCD/b5b2s5BruEmSdq IvdMchKs2lIMTCK3mewBcQZsMB6Wiw6qIZbCbvuk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, William Dauchy , Nicolas Dichtel , "David S. Miller" Subject: [PATCH 4.19 08/92] net, ip6_tunnel: fix namespaces move Date: Tue, 28 Jan 2020 15:07:36 +0100 Message-Id: <20200128135810.294539526@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135809.344954797@linuxfoundation.org> References: <20200128135809.344954797@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: William Dauchy [ Upstream commit 5311a69aaca30fa849c3cc46fb25f75727fb72d0 ] in the same manner as commit d0f418516022 ("net, ip_tunnel: fix namespaces move"), fix namespace moving as it was broken since commit 8d79266bc48c ("ip6_tunnel: add collect_md mode to IPv6 tunnel"), but for ipv6 this time; there is no reason to keep it for ip6_tunnel. Fixes: 8d79266bc48c ("ip6_tunnel: add collect_md mode to IPv6 tunnel") Signed-off-by: William Dauchy Acked-by: Nicolas Dichtel Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv6/ip6_tunnel.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -1882,10 +1882,8 @@ static int ip6_tnl_dev_init(struct net_d if (err) return err; ip6_tnl_link_config(t); - if (t->parms.collect_md) { - dev->features |= NETIF_F_NETNS_LOCAL; + if (t->parms.collect_md) netif_keep_dst(dev); - } return 0; }