From patchwork Tue Aug 14 15:05:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 1320991 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 0F1DF3FC81 for ; Tue, 14 Aug 2012 15:11:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756588Ab2HNPKm (ORCPT ); Tue, 14 Aug 2012 11:10:42 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:52683 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756555Ab2HNPGO (ORCPT ); Tue, 14 Aug 2012 11:06:14 -0400 Received: by mail-ee0-f46.google.com with SMTP id l10so194033eei.19 for ; Tue, 14 Aug 2012 08:06:14 -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=IhnXCWySbisu6hkPFogBLE6vNlXay4cxPGbVfwowCpQ=; b=OSUp+DlHA1ycsOpBwYKjwEMHDcP+ZPClZiBFuPR6TCufTjyCOARyvP9fvYvGDftGnb tFZ9aYI+8WOZEwaEd1AsVSM52sM0NiTp64vi3B5dETE8QqScvsidr/FWGFD4nG2esddc 3y74cD0niNLk+DjJb/Nytup6trbyARGMT48RZZ+HFb0Yeey2jsU8D1JGVjbxzvew66we RWl+uq5RbUkvMnuEvm4Vl3vTDebbQLR/eSZYyN+4u6HLa7EE97Qom1xxudK56Z4QiIdX 6cNl0VEwtos2b2yhNcqM9cYhcsUQo9Ou0DmEXZkXnf3pLjAmaNan2CuCS2iXl7sF5U5g YMFQ== Received: by 10.14.212.72 with SMTP id x48mr19678659eeo.40.1344956773697; Tue, 14 Aug 2012 08:06:13 -0700 (PDT) Received: from localhost (nat-pool-brq-t.redhat.com. [209.132.186.34]) by mx.google.com with ESMTPS id k49sm7611359een.4.2012.08.14.08.06.12 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Aug 2012 08:06:13 -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 06/15] bridge: remove usage of netdev_set_master() Date: Tue, 14 Aug 2012 17:05:39 +0200 Message-Id: <1344956748-2099-7-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: ALoCoQlCb1n2nqQ3Ffdpj7sJRuwsdzYT1IgtJ2pcYioqwc02PfBr89cyf1xZV08msHQVjU8iyP+o 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 e1144e1..8bea645 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)))) goto err3; - err = netdev_set_master(dev, br->dev); + err = netdev_master_upper_dev_link(dev, br->dev); if (err) goto err3; @@ -403,7 +403,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) return 0; err4: - netdev_set_master(dev, NULL); + netdev_upper_dev_unlink(dev, br->dev); err3: sysfs_remove_link(br->ifobj, p->dev->name); err2: