From patchwork Mon Aug 13 15:27:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 1313761 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 774093FC81 for ; Mon, 13 Aug 2012 15:31:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751444Ab2HMP1i (ORCPT ); Mon, 13 Aug 2012 11:27:38 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:60996 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752081Ab2HMP1g (ORCPT ); Mon, 13 Aug 2012 11:27:36 -0400 Received: by mail-ee0-f46.google.com with SMTP id l10so1192584eei.19 for ; Mon, 13 Aug 2012 08:27:35 -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=mKaTvo1aqAv7lNb4SYcue7NKp8acw+Y72uGBJpT8Xzg=; b=GFmqLySxqLkMucSOKOf9lQLqUehL7dj+SyBdCA2lQuTuSnncNlPHKiHVgbGoW8baCF +1sCjr5A8wozmS8fPltjDtpH9R+XcPA26ZRdb4vQ9BJHOSRFVz6k/rGuK9kurTYjFJ71 Oxf2nEDjhGMLgCJC9Ny5lgQozSn/opwv7HXlIffCz8ao0TVQbAEWejyRSukOVfxeJIwM bjDkwOXpcpaWw6e3CfhCK0q4+f01YPldSBRwpLK5rlNf3SbHr2YlqFFgg1Q4xo4YaL6I nTnc1M+wBcZZoBbxbwE9adG1uQhx+SGgOnKfec37VO7in8CpSpMy0KRO8H990e7lkecx WX6g== Received: by 10.14.172.129 with SMTP id t1mr14649019eel.34.1344871655711; Mon, 13 Aug 2012 08:27:35 -0700 (PDT) Received: from localhost (nat-pool-brq-t.redhat.com. [209.132.186.34]) by mx.google.com with ESMTPS id l42sm17662247eep.1.2012.08.13.08.27.34 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 13 Aug 2012 08:27:35 -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 06/16] bridge: remove usage of netdev_set_master() Date: Mon, 13 Aug 2012 17:27:05 +0200 Message-Id: <1344871635-1052-7-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1344871635-1052-1-git-send-email-jiri@resnulli.us> References: <1344871635-1052-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQmojHoAKZiXyBqCpml1oCPvOpHbl5Ar3QbVdIWLu9KkyxDPg5ZcusPBGGo0YukUbXS2aIdQ 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..5933900 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_unique_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: