From patchwork Tue Aug 14 15:05:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 1321051 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 EA6E3DF215 for ; Tue, 14 Aug 2012 15:12:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756557Ab2HNPLt (ORCPT ); Tue, 14 Aug 2012 11:11:49 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:33776 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756503Ab2HNPGB (ORCPT ); Tue, 14 Aug 2012 11:06:01 -0400 Received: by mail-ey0-f174.google.com with SMTP id c11so194843eaa.19 for ; Tue, 14 Aug 2012 08:06:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=F+ib7En+Rz1eX68aLafWv2qjnDkGlLHyjEsjFDWddXc=; b=Uglca8BMSZvRXHve63O9HXOawLg4H+re3PVANHS7z4LzYz/XjWXTtqogUDqPKO9F3R nK1ZFSSxbHaYgPH/uQyZ/pSObfhfaWHRz8IfCY7QMpgAqbIafNF8Jcq1NnZNUQlXbfkN 396EIfc2PHD6OZDEQXNyhGqjpTlQZ8CDhB4X118LDos+AvVhzgrsAwlyf9VbmuukvBxd 02VLZLyRamLlHmA6XSkUxbQ63UG+BO/lzSvdh7O5ysKxuJQOe4T0HFZjtjMOCj3wDSpx gt40yMlEWBZURXFi+s9ZSNJEWslhwDS4YrhLZ0BTR0IhhIx8jWhY6aZmGI1L0D0biQvB zxCA== Received: by 10.14.203.73 with SMTP id e49mr15663402eeo.27.1344956760115; Tue, 14 Aug 2012 08:06:00 -0700 (PDT) Received: from localhost (nat-pool-brq-t.redhat.com. [209.132.186.34]) by mx.google.com with ESMTPS id m45sm7550332eep.16.2012.08.14.08.05.58 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Aug 2012 08:05:59 -0700 (PDT) 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 v2 02/15] macvlan: add link to upper device Date: Tue, 14 Aug 2012 17:05:35 +0200 Message-Id: <1344956748-2099-3-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1344956748-2099-1-git-send-email-jiri@resnulli.us> References: <1344956748-2099-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQlBrCDHCWwTORDjkGJOv1jarlALMrnuxJEPGDzKA0E6jU6+/UlGcGUhdoBdo4gusDyoTRGp 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 66a9bfe..f5bd8a2 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);