From patchwork Sun Dec 30 11:58:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 208738 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 4F5762C00B5 for ; Sun, 30 Dec 2012 22:59:08 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754491Ab2L3L7G (ORCPT ); Sun, 30 Dec 2012 06:59:06 -0500 Received: from mail-ee0-f48.google.com ([74.125.83.48]:50854 "EHLO mail-ee0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754466Ab2L3L7D (ORCPT ); Sun, 30 Dec 2012 06:59:03 -0500 Received: by mail-ee0-f48.google.com with SMTP id b57so5924544eek.35 for ; Sun, 30 Dec 2012 03:59:02 -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=DwSjZiggSH5e0KTaEP15ghgRzGoO6If8Zs+DPpk/P1RAwzWaL+iWva4z1qq0LYZdtQ M8qm8cUPEskAY8JMiReJ8W2/4U84C+FjmvWpa4MkI81jFzPFNK/JA9nz8QHJDeedwPQW f+2AX8pho4E6Rqu9h2k53K231g7t121n71SuUdF7t9i0hO3kWY7Lk8TcIb83n9JwR/TC B+IntV2rSDy/obdeMCUPnqC5PcCAZ9I2GyUs3ot4STYmFQvXzlSt4rA3dbQEzlWCxgZf Omv2GEgPcrclqFD9n8Yq36f9pd981Js3jXH8ytEshJ1d3HWZszf6FUsXS8tIpoMzyk9J SslA== X-Received: by 10.14.0.133 with SMTP id 5mr101446973eeb.29.1356868741918; Sun, 30 Dec 2012 03:59:01 -0800 (PST) Received: from localhost (sun-0.pirko.cz. [84.16.102.25]) by mx.google.com with ESMTPS id 46sm78362822eeg.4.2012.12.30.03.58.53 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 30 Dec 2012 03:59:01 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, bhutchings@solarflare.com, faisal.latif@intel.com, shemminger@vyatta.com, fbl@redhat.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, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, ebiederm@xmission.com, joe@perches.com, amwang@redhat.com, nhorman@tuxdriver.com, john.r.fastabend@intel.com, pablo@netfilter.org Subject: [patch net-next 02/15] macvlan: add link to upper device Date: Sun, 30 Dec 2012 12:58:09 +0100 Message-Id: <1356868702-8144-3-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1356868702-8144-1-git-send-email-jiri@resnulli.us> References: <1356868702-8144-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQldQnbw6QAthySN24z3sE57WGeMzPOUYI2v6omGG4juZxcaXCStDF9+Fk+8aL0tyX902Gdv Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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);