From patchwork Sun Dec 30 11:58:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 208742 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 6DAFA2C00B0 for ; Sun, 30 Dec 2012 22:59:52 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754511Ab2L3L7u (ORCPT ); Sun, 30 Dec 2012 06:59:50 -0500 Received: from mail-ea0-f178.google.com ([209.85.215.178]:53853 "EHLO mail-ea0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754023Ab2L3L7t (ORCPT ); Sun, 30 Dec 2012 06:59:49 -0500 Received: by mail-ea0-f178.google.com with SMTP id k11so5004964eaa.9 for ; Sun, 30 Dec 2012 03:59:47 -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=cefqv1qrIH2Hou96xp14WsjwSTAM0CBQRSg/3BuA7GI=; b=bU+jt/o12DT1lFu6vOv12bL2eFx+2ma+Ddhdf1AeFO2gfZLENoR4stmzbOuRh6O+yz eTLOXungHLlGPrPskpmb2oJWaSYS8j1TinT+xAd8FYfSx634Sx9zTAmf348NAM/UUde+ gMJ1JYnlIXbIfoI9Dw75I9v+EzI6npkViejBZMRScbkPEUYvNPzrapaKv7KiEKpbKYKk DQOGMNRlf0NqYA0tndmkzZOmnk151ZnJDF4H48KxrNfQzYjkI+4OcqJ9B058rez44E7K pbDQuc4/pcG1QoB6Lkj0Uyr4l1f6csd/NZW2RiHCOtf8ZlKYEi/ataQgxLL/kCOQT2Fc /y/g== X-Received: by 10.14.216.70 with SMTP id f46mr102793652eep.12.1356868787750; Sun, 30 Dec 2012 03:59:47 -0800 (PST) Received: from localhost (sun-0.pirko.cz. [84.16.102.25]) by mx.google.com with ESMTPS id e2sm78374166eeo.8.2012.12.30.03.59.40 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 30 Dec 2012 03:59:47 -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 06/15] bridge: remove usage of netdev_set_master() Date: Sun, 30 Dec 2012 12:58:13 +0100 Message-Id: <1356868702-8144-7-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: ALoCoQk8bz0EPqCuPsTUHzzrCJLeA8Nhqfd3rHgM38t5Km6epJDLxKJVOO40WIKLxni5fg/FuHuh Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Jiri Pirko --- net/bridge/br_if.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 1edd71d..2148d47 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -148,7 +148,7 @@ static void del_nbp(struct net_bridge_port *p) netdev_rx_handler_unregister(dev); synchronize_net(); - netdev_set_master(dev, NULL); + netdev_upper_dev_unlink(dev, br->dev); br_multicast_del_port(p); @@ -364,7 +364,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) if (br_netpoll_info(br) && ((err = br_netpoll_enable(p, GFP_KERNEL)))) goto err3; - err = netdev_set_master(dev, br->dev); + err = netdev_master_upper_dev_link(dev, br->dev); if (err) goto err4; @@ -403,7 +403,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) return 0; err5: - netdev_set_master(dev, NULL); + netdev_upper_dev_unlink(dev, br->dev); err4: br_netpoll_disable(p); err3: