From patchwork Wed Jan 2 12:28:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 1923351 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 66926DF25A for ; Wed, 2 Jan 2013 12:35:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752693Ab3ABMfh (ORCPT ); Wed, 2 Jan 2013 07:35:37 -0500 Received: from mail-ea0-f180.google.com ([209.85.215.180]:57760 "EHLO mail-ea0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752691Ab3ABMfc (ORCPT ); Wed, 2 Jan 2013 07:35:32 -0500 Received: by mail-ea0-f180.google.com with SMTP id f13so5717274eai.39 for ; Wed, 02 Jan 2013 04:35:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=7MTDqRRaV52dqB09shlOpmmwlYxXuIJgfMDT3JPctys=; b=I+QXvwDpaTCvD9qM0xQdZcksHc6MpoaTL65tD7nU3LJ2OLz8cV0ZIFxZ69e5vxB4tL j1WcG4pDJ8CSRu1suNmDNW2xXYS/RcHCuMFCZssWIlvqo+Ee+ND4FkjEU8d6rq45bHFY BDWyvMT+RBTZt1mWLpdSo/9nG62GZEuw/uzbl6s8fUj4kAsJPdKY9JXCBDGJBENlfaxT Wv0hc1A5aPQ4MukoNaNGa6CMmzSaZL4Gu+PqCMsAjJ2MdeNF9xxMESbMmSUkxiYoz9/Q OzPy956F6GQN2xkA4wSro2DuFlDrdtL1mk+dC2IGufvaZZNzTFy9n7vDrqhjzxFbL18J x4PQ== X-Received: by 10.14.173.69 with SMTP id u45mr125264917eel.21.1357129729772; Wed, 02 Jan 2013 04:28:49 -0800 (PST) Received: from localhost (sun-0.pirko.cz. [84.16.102.25]) by mx.google.com with ESMTPS id v46sm97210222eep.1.2013.01.02.04.28.47 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 02 Jan 2013 04:28:49 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, faisal.latif@intel.com, roland@kernel.org, sean.hefty@intel.com, hal.rosenstock@gmail.com, fubar@us.ibm.com, andy@greyhouse.net, divy@chelsio.com, jitendra.kalsaria@qlogic.com, sony.chacko@qlogic.com, linux-driver@qlogic.com, kaber@trash.net, ursula.braun@de.ibm.com, blaschka@linux.vnet.ibm.com, linux390@de.ibm.com, shemminger@vyatta.com, bhutchings@solarflare.com, therbert@google.com, xiyou.wangcong@gmail.com, joe@perches.com, gregory.v.rose@intel.com, john.r.fastabend@intel.com, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, bridge@lists.linux-foundation.org, fbl@redhat.com Subject: [patch net-next V5 02/15] macvlan: add link to upper device Date: Wed, 2 Jan 2013 13:28:23 +0100 Message-Id: <1357129716-2450-3-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1357129716-2450-1-git-send-email-jiri@resnulli.us> References: <1357129716-2450-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQlhFL2uEYoU04KotTGFaqK3DgjM0gCz3rmR1i2edXa9BKBnFF8JEX1SSBOmSSKlzZmSNVhK Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Signed-off-by: Jiri Pirko --- drivers/net/macvlan.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 68a43fe..b7b614f 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -765,16 +765,22 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev, memcpy(dev->dev_addr, lowerdev->dev_addr, ETH_ALEN); } + err = netdev_upper_dev_link(lowerdev, dev); + if (err) + goto destroy_port; + port->count += 1; err = register_netdevice(dev); if (err < 0) - goto destroy_port; + goto upper_dev_unlink; list_add_tail(&vlan->list, &port->vlans); netif_stacked_transfer_operstate(lowerdev, dev); return 0; +upper_dev_unlink: + netdev_upper_dev_unlink(lowerdev, dev); destroy_port: port->count -= 1; if (!port->count) @@ -798,6 +804,7 @@ void macvlan_dellink(struct net_device *dev, struct list_head *head) list_del(&vlan->list); unregister_netdevice_queue(dev, head); + netdev_upper_dev_unlink(vlan->lowerdev, dev); } EXPORT_SYMBOL_GPL(macvlan_dellink);