From patchwork Fri Jan 4 08:48:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 209397 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 879EF2C0086 for ; Fri, 4 Jan 2013 19:53:29 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754315Ab3ADIx0 (ORCPT ); Fri, 4 Jan 2013 03:53:26 -0500 Received: from mail-ee0-f50.google.com ([74.125.83.50]:45933 "EHLO mail-ee0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754188Ab3ADIth (ORCPT ); Fri, 4 Jan 2013 03:49:37 -0500 Received: by mail-ee0-f50.google.com with SMTP id b45so8144002eek.9 for ; Fri, 04 Jan 2013 00:49:34 -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=R9Djk/aF5QJR/ZpjwhGyQuPoUVrq8PSrUwpcDmBnCZLhi7HzRg/OP+/bmG4mNeKcDm Nan4H7J4OAIoWwyV1CGDmC2K42U0sTOWI1v+WRykiSatnNfK58FvJFhdD3vGqMr34OOV 6CPYe9spPojBd9cpHH7cfe+Tv6wde4r92mbnwlgRKD3vblIA8v6CYcffUkFovjPiCJjV DYb4E9JwGSsjgUJYkzMx9Gug2HFOFY8stDBB/XdCfArL/ALUG6RPJ7dUY/RPWA5GLyR7 CNDFkoHBzkHjZAqSyq/KRcQTwJvfY4zl2OTovdA6JKEnq2faZiSO1LgueqPa9ZPqQQDv NHyw== X-Received: by 10.14.194.199 with SMTP id m47mr141587306een.11.1357289374249; Fri, 04 Jan 2013 00:49:34 -0800 (PST) Received: from localhost (ip-89-103-8-129.net.upcbroadband.cz. [89.103.8.129]) by mx.google.com with ESMTPS id 6sm109288897eea.3.2013.01.04.00.49.31 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 04 Jan 2013 00:49:33 -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 06/15] bridge: remove usage of netdev_set_master() Date: Fri, 4 Jan 2013 09:48:54 +0100 Message-Id: <1357289343-817-7-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: ALoCoQlOB7MVAqtEd1bu+ZwZvUlDjoSlwIsE6c5TqDKM3cLnWha7v4uhgXfRoFD7EeAO3nwedFQf 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: