From patchwork Fri Jan 4 08:48:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 1931431 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 C83C2DFABD for ; Fri, 4 Jan 2013 08:50:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754316Ab3ADItm (ORCPT ); Fri, 4 Jan 2013 03:49:42 -0500 Received: from mail-ee0-f46.google.com ([74.125.83.46]:63341 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754061Ab3ADItZ (ORCPT ); Fri, 4 Jan 2013 03:49:25 -0500 Received: by mail-ee0-f46.google.com with SMTP id e53so7789994eek.19 for ; Fri, 04 Jan 2013 00:49:23 -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=iRnoiD4cQy0NoR4++ky5SExW5gXfq7MEl16rohp5/EE=; b=BFB7IZEdAfwtRgjh9UorcY3zDmbvF6uQp/Cnt/eCMsnkFATm1Mr5velIoemCbpyBau jrZU8iGgqDO+FQEk4aHS37HdwvoCod8V6BLTosIyYy9E77v+ZW4JY7Ll2BpcVHdf/zB/ b03aKKl+f5tn5/KyiiKz1dgBjMeZE+gzNJcAkvCCGz8WQg1jaR3dT5iSD9zSDc4ik+Ep T+cUtvfFkua91qIh2mc7+zuKk1iW4mxHzexTP0Gjg6JAYC+95lsFjhDaNeKchV9zCiSG CIFonJYg5H3Q8ddLAMF/rczRFOyVmPCWSjZDoGSPokyXhY1Har4tb3K+y8/2V934aV/k 4njA== X-Received: by 10.14.216.70 with SMTP id f46mr141901812eep.12.1357289362854; Fri, 04 Jan 2013 00:49:22 -0800 (PST) Received: from localhost (ip-89-103-8-129.net.upcbroadband.cz. [89.103.8.129]) by mx.google.com with ESMTPS id 6sm109287471eea.3.2013.01.04.00.49.20 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 04 Jan 2013 00:49:22 -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 V6 03/15] vlan: add link to upper device Date: Fri, 4 Jan 2013 09:48:51 +0100 Message-Id: <1357289343-817-4-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1357289343-817-1-git-send-email-jiri@resnulli.us> References: <1357289343-817-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQmnvUwk4n5PNrBILmfVg75yR9x+G9uVxN9CeLF3gjHPwCjGm8CvIt+aYIB5J+zhpHNH8XP8 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Signed-off-by: Jiri Pirko --- net/8021q/vlan.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index a292e80..babfde9 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -105,6 +105,8 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head) */ unregister_netdevice_queue(dev, head); + netdev_upper_dev_unlink(real_dev, dev); + if (grp->nr_vlan_devs == 0) vlan_gvrp_uninit_applicant(real_dev); @@ -162,9 +164,13 @@ int register_vlan_dev(struct net_device *dev) if (err < 0) goto out_uninit_applicant; + err = netdev_upper_dev_link(real_dev, dev); + if (err) + goto out_uninit_applicant; + err = register_netdevice(dev); if (err < 0) - goto out_uninit_applicant; + goto out_upper_dev_unlink; /* Account for reference in struct vlan_dev_priv */ dev_hold(real_dev); @@ -180,6 +186,8 @@ int register_vlan_dev(struct net_device *dev) return 0; +out_upper_dev_unlink: + netdev_upper_dev_unlink(real_dev, dev); out_uninit_applicant: if (grp->nr_vlan_devs == 0) vlan_gvrp_uninit_applicant(real_dev);