Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933866AbcDLW4V (ORCPT ); Tue, 12 Apr 2016 18:56:21 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:52579 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965577AbcDLWzo (ORCPT ); Tue, 12 Apr 2016 18:55:44 -0400 From: Kamal Mostafa To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Thadeu Lima de Souza Cascardo , "David S . Miller" , Kamal Mostafa Subject: [PATCH 3.13.y-ckt 16/16] ip6_tunnel: set rtnl_link_ops before calling register_netdevice Date: Tue, 12 Apr 2016 15:55:14 -0700 Message-Id: <1460501714-22007-17-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1460501714-22007-1-git-send-email-kamal@canonical.com> References: <1460501714-22007-1-git-send-email-kamal@canonical.com> X-Extended-Stable: 3.13 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1407 Lines: 43 3.13.11-ckt39 -stable review patch. If anyone has any objections, please let me know. ---8<------------------------------------------------------------ From: Thadeu Lima de Souza Cascardo commit b6ee376cb0b7fb4e7e07d6cd248bd40436fb9ba6 upstream. When creating an ip6tnl tunnel with ip tunnel, rtnl_link_ops is not set before ip6_tnl_create2 is called. When register_netdevice is called, there is no linkinfo attribute in the NEWLINK message because of that. Setting rtnl_link_ops before calling register_netdevice fixes that. Fixes: 0b112457229d ("ip6tnl: add support of link creation via rtnl") Signed-off-by: Thadeu Lima de Souza Cascardo Acked-by: Nicolas Dichtel Signed-off-by: David S. Miller Signed-off-by: Kamal Mostafa --- net/ipv6/ip6_tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 29ecff5..c9db9f7 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -276,12 +276,12 @@ static int ip6_tnl_create2(struct net_device *dev) t = netdev_priv(dev); + dev->rtnl_link_ops = &ip6_link_ops; err = register_netdevice(dev); if (err < 0) goto out; strcpy(t->parms.name, dev->name); - dev->rtnl_link_ops = &ip6_link_ops; dev_hold(dev); ip6_tnl_link(ip6n, t); -- 2.7.4