From patchwork Tue Aug 14 15:05:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 1321011 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id BEE7D3FC81 for ; Tue, 14 Aug 2012 15:11:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756529Ab2HNPGI (ORCPT ); Tue, 14 Aug 2012 11:06:08 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:37087 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756519Ab2HNPGE (ORCPT ); Tue, 14 Aug 2012 11:06:04 -0400 Received: by mail-ee0-f46.google.com with SMTP id l10so194069eei.19 for ; Tue, 14 Aug 2012 08:06:04 -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=7o0aE66DcDsPif0sTjJFzmzeKH7bz4yXkNnpL7anqzs=; b=mq8VjRSQRWCjsoxPhUNsstdq/qmtPZGZQEzFlcqeef4vXS5MGO89nYoHu0m4lpcIJ/ BHmSZ23TiNqzbvu0w7rXakzVSwTeZHhTvBgnJKtZl18MWLWXNDxC/Wyp0s/MMUIEfD0X rQOE/uMEA6rcnign7L2BjaukgT9boOeWfEzyQd4NAsgsz9pH9eMmAx7asRdHWLaUc0R6 RFoVviveJ/pWKo9ccAf5HtGab1ZZJQ8Y2SVrwVX+yt8hcUeXFzYdquqD9vPxymgAF3+z Msm2AD1yLE9zd5P9OEDDhkrEf9KBq+JTuUucp2Pxpk2z4uNVljso6pyWFxroZFsSRbQu 4VYQ== Received: by 10.14.219.198 with SMTP id m46mr19733982eep.18.1344956763758; Tue, 14 Aug 2012 08:06:03 -0700 (PDT) Received: from localhost (nat-pool-brq-t.redhat.com. [209.132.186.34]) by mx.google.com with ESMTPS id 45sm7592964eeb.8.2012.08.14.08.06.02 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Aug 2012 08:06:03 -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 03/15] vlan: add link to upper device Date: Tue, 14 Aug 2012 17:05:36 +0200 Message-Id: <1344956748-2099-4-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: ALoCoQkPbHhha8pYOi6BBJHZkD5i7tUrSpfH9ZgGxkMLyw44AKVFAwyuuEG/x3TinLkm811Nh/NW 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 9096bcb..2dca0fa 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);