From patchwork Mon Aug 13 15:27:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 176973 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 920F72C007E for ; Tue, 14 Aug 2012 01:31:56 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752748Ab2HMPbh (ORCPT ); Mon, 13 Aug 2012 11:31:37 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:55463 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752688Ab2HMP1e (ORCPT ); Mon, 13 Aug 2012 11:27:34 -0400 Received: by mail-ey0-f174.google.com with SMTP id c11so1186782eaa.19 for ; Mon, 13 Aug 2012 08:27:33 -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=kKkurp8SD9pOTL2gz5COQOKevns2VWGW/4TaElC+n9Y=; b=WwApWplhdSSEjbosoXEOY5npl0Cp/4nVr/5KELqHeTs/GSnINf5Qa79K3Lgps/ekXt +hdUVFUBjB+/5hQ8kObKvuU5je0n35dKQhlJvVftVCj+S2lG1vGIW8N2GV9KZIbpY2tf O+HbrXlqN05RyAHf/KNQJpAvUUt5Y+5D0cWe0XaivNnKfdZT2vy8lVNJTN33Jqoy+QrI MbNKyIwLBxZzYobYm414aC25lPjOJ2oi29xj3kZi7KXocbb0fE1iHB7wHpTs0rh77uLX r/xVhLA0o/rI2S+/w9NwerWXkVVZpHc70bo1Xlo7lm2jVYRt/mGGM/crp08vjTsBAcJb mW5A== Received: by 10.14.216.198 with SMTP id g46mr1172997eep.32.1344871653151; Mon, 13 Aug 2012 08:27:33 -0700 (PDT) Received: from localhost (nat-pool-brq-t.redhat.com. [209.132.186.34]) by mx.google.com with ESMTPS id 45sm19813920eed.17.2012.08.13.08.27.31 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 13 Aug 2012 08:27:32 -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 05/16] team: remove usage of netdev_set_master() Date: Mon, 13 Aug 2012 17:27:04 +0200 Message-Id: <1344871635-1052-6-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: ALoCoQnPfMnPieQKk36CmWdUe1MnbMiXnwmOgFydfs7NHfsUdPyXaPqNXyIn12eN1XWSG06mHGr9 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Jiri Pirko --- drivers/net/team/team.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index ba10c46..0533cbf 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1040,10 +1040,11 @@ static int team_port_add(struct team *team, struct net_device *port_dev) } } - err = netdev_set_master(port_dev, dev); + err = netdev_unique_upper_dev_link(port_dev, dev); if (err) { - netdev_err(dev, "Device %s failed to set master\n", portname); - goto err_set_master; + netdev_err(dev, "Device %s failed to set upper link\n", + portname); + goto err_set_upper_link; } err = netdev_rx_handler_register(port_dev, team_handle_frame, @@ -1076,9 +1077,9 @@ err_option_port_add: netdev_rx_handler_unregister(port_dev); err_handler_register: - netdev_set_master(port_dev, NULL); + netdev_upper_dev_unlink(port_dev, dev); -err_set_master: +err_set_upper_link: team_port_disable_netpoll(port); err_enable_netpoll: @@ -1121,7 +1122,7 @@ static int team_port_del(struct team *team, struct net_device *port_dev) team_port_disable(team, port); list_del_rcu(&port->list); netdev_rx_handler_unregister(port_dev); - netdev_set_master(port_dev, NULL); + netdev_upper_dev_unlink(port_dev, dev); team_port_disable_netpoll(port); vlan_vids_del_by_dev(port_dev, dev); dev_close(port_dev);