From patchwork Wed Jan 2 12:28:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 1923271 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 88FC5DF215 for ; Wed, 2 Jan 2013 12:30:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752805Ab3ABM3O (ORCPT ); Wed, 2 Jan 2013 07:29:14 -0500 Received: from mail-ee0-f46.google.com ([74.125.83.46]:53870 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752768Ab3ABM3E (ORCPT ); Wed, 2 Jan 2013 07:29:04 -0500 Received: by mail-ee0-f46.google.com with SMTP id e53so7015456eek.33 for ; Wed, 02 Jan 2013 04:29:03 -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=Q/i/tWAtdI9YMLNSB/MfwXmtubeAemlYlxnFT/HKsVX1eBjukFBv1BaudG3AJ38rk+ pjuNqTECa48xjd/XJ5yGmv//2DWPZxKSya575XIUezIkv6wQlvyY+A5F0OXUFPvcJJx9 GbAghw6UHpNgtDEpwAPYpsk7TrQ+u80tLb2Py64h39hPizya4dlz35WQljmK1iGCfFgg W3flHv2i9cN4nlzK+1BIhhxo+bK8E6uKb3KH0ppss9e94iO3xWLHgmzAcdDz+ckvex9I d2Kz1CxSg+Wel38uRjIiZmA7qZD9NbY2LNfsEssmbe0a4r1fsQuX+JpPOf/tBNCMm5ZQ 8LNw== X-Received: by 10.14.194.4 with SMTP id l4mr125103530een.42.1357129743548; Wed, 02 Jan 2013 04:29:03 -0800 (PST) Received: from localhost (sun-0.pirko.cz. [84.16.102.25]) by mx.google.com with ESMTPS id r1sm97213792eeo.2.2013.01.02.04.29.01 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 02 Jan 2013 04:29:02 -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 V5 06/15] bridge: remove usage of netdev_set_master() Date: Wed, 2 Jan 2013 13:28:27 +0100 Message-Id: <1357129716-2450-7-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1357129716-2450-1-git-send-email-jiri@resnulli.us> References: <1357129716-2450-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQmK1+hBO8a0RgJ7LHXvRe17rXYm/QbQdO4pzl0j2Woj5wZg1NDUf//JsG+MjsSTghVMhIaN 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/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: