From patchwork Thu Feb 27 08:00:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffen Klassert X-Patchwork-Id: 324713 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7905E2C009F for ; Thu, 27 Feb 2014 19:01:11 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751458AbaB0IBE (ORCPT ); Thu, 27 Feb 2014 03:01:04 -0500 Received: from a.mx.secunet.com ([195.81.216.161]:59058 "EHLO a.mx.secunet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751326AbaB0IBD (ORCPT ); Thu, 27 Feb 2014 03:01:03 -0500 Received: from localhost (alg1 [127.0.0.1]) by a.mx.secunet.com (Postfix) with ESMTP id 638FD1A007B; Thu, 27 Feb 2014 09:01:03 +0100 (CET) X-Virus-Scanned: by secunet Received: from a.mx.secunet.com ([127.0.0.1]) by localhost (a.mx.secunet.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id f3nBOoc6AAEy; Thu, 27 Feb 2014 09:01:02 +0100 (CET) Received: from mail-gw-int (unknown [10.53.40.207]) by a.mx.secunet.com (Postfix) with ESMTP id 9D2C51A00A3; Thu, 27 Feb 2014 09:00:48 +0100 (CET) Received: from [10.53.40.204] (port=36301 helo=mail-essen-01.secunet.de) by mail-gw-int with esmtp (Exim 4.80 #2 (Debian)) id 1WIvnW-0001Zb-9J; Thu, 27 Feb 2014 08:54:26 +0100 Received: from gauss.dd.secunet.de (10.182.7.102) by mail-essen-01.secunet.de (10.53.40.204) with Microsoft SMTP Server id 14.3.174.1; Thu, 27 Feb 2014 09:00:47 +0100 Received: by gauss.dd.secunet.de (Postfix, from userid 1000) id C8B4B5C23CA; Thu, 27 Feb 2014 09:00:47 +0100 (CET) From: Steffen Klassert To: David Miller CC: Herbert Xu , Steffen Klassert , Subject: [PATCH 12/12] vti4: Enable namespace changing Date: Thu, 27 Feb 2014 09:00:40 +0100 Message-ID: <1393488040-22005-13-git-send-email-steffen.klassert@secunet.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1393488040-22005-1-git-send-email-steffen.klassert@secunet.com> References: <1393488040-22005-1-git-send-email-steffen.klassert@secunet.com> MIME-Version: 1.0 X-Originating-IP: [10.182.7.102] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org vti4 is now fully namespace aware, so allow namespace changing for vti devices Signed-off-by: Steffen Klassert --- net/ipv4/ip_vti.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index 9471893..687ddef 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -354,7 +354,6 @@ static int vti_tunnel_init(struct net_device *dev) dev->flags = IFF_NOARP; dev->iflink = 0; dev->addr_len = 4; - dev->features |= NETIF_F_NETNS_LOCAL; dev->features |= NETIF_F_LLTX; dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;