From patchwork Thu Dec 8 03:16:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?6auY5bOw?= X-Patchwork-Id: 703932 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 3tZ0t21S3cz9t26 for ; Thu, 8 Dec 2016 14:17:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753538AbcLHDRl (ORCPT ); Wed, 7 Dec 2016 22:17:41 -0500 Received: from smtpbg342.qq.com ([14.17.44.37]:55290 "EHLO smtpbg342.qq.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753274AbcLHDRk (ORCPT ); Wed, 7 Dec 2016 22:17:40 -0500 X-QQ-mid: bizesmtp4t1481167025t9a49hieh Received: from ikuai-dev.ikuai8.com (unknown [123.56.230.35]) by esmtp4.qq.com (ESMTP) with id ; Thu, 08 Dec 2016 11:16:59 +0800 (CST) X-QQ-SSF: 01400000002000F0FH40000B0000000 X-QQ-FEAT: IhrZBUlRAsjUHjq4wwlw9voqygIiOsc0VzDZoTPDwjFdx2+w2p5mklLtq5hKo yVkArBFh1jx0Et/M0+Wpdiku0Nnw0A51IrMNG7rm+ekeeGFr2T4j822W/LGtAosYGxm8xbw gRe09H/+jPM/cuiyDsxw2cSVUDwNg6DrWQux0cWYishD/tcrRdhO8nIMi3baodeiRX+VRwl 31Zr7/pVfubq+3HcGqpQNFuueOKcoh56IiLVyMxZnHrr7fVSfloztT7SVphl+B3IjWIm/ik HcMihgUNRezX0V X-QQ-GoodBg: 2 From: fgao@ikuai8.com To: davem@davemloft.net, maheshb@google.com, edumazet@google.com, netdev@vger.kernel.org, gfree.wind@gmail.com Cc: Gao Feng Subject: [PATCH net v2 1/1] driver: ipvlan: Unlink the upper dev when ipvlan_link_new failed Date: Thu, 8 Dec 2016 11:16:58 +0800 Message-Id: <1481167018-559-1-git-send-email-fgao@ikuai8.com> X-Mailer: git-send-email 1.9.1 X-QQ-SENDSIZE: 520 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Gao Feng When netdev_upper_dev_unlink failed in ipvlan_link_new, need to unlink the ipvlan dev with upper dev. Signed-off-by: Gao Feng Acked-by: Mahesh Bandewar --- v2: Rename the label to unlink_netdev, per Mahesh Bandewar v1: Initial patch drivers/net/ipvlan/ipvlan_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c index 0fef178..dfbc4ef 100644 --- a/drivers/net/ipvlan/ipvlan_main.c +++ b/drivers/net/ipvlan/ipvlan_main.c @@ -546,13 +546,15 @@ static int ipvlan_link_new(struct net *src_net, struct net_device *dev, } err = ipvlan_set_port_mode(port, mode); if (err) { - goto unregister_netdev; + goto unlink_netdev; } list_add_tail_rcu(&ipvlan->pnode, &port->ipvlans); netif_stacked_transfer_operstate(phy_dev, dev); return 0; +unlink_netdev: + netdev_upper_dev_unlink(phy_dev, dev); unregister_netdev: unregister_netdevice(dev); destroy_ipvlan_port: