From patchwork Sun Dec 30 11:58:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 208741 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 AA1262C00B0 for ; Sun, 30 Dec 2012 22:59:41 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753806Ab2L3L7j (ORCPT ); Sun, 30 Dec 2012 06:59:39 -0500 Received: from mail-ee0-f52.google.com ([74.125.83.52]:47599 "EHLO mail-ee0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754482Ab2L3L7i (ORCPT ); Sun, 30 Dec 2012 06:59:38 -0500 Received: by mail-ee0-f52.google.com with SMTP id d17so5710696eek.11 for ; Sun, 30 Dec 2012 03:59:37 -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=SVQufaUaKAKE98bP84GYp7wFiNNWdUqb7eHW/ofAWBw=; b=E2NbeotVIzpftrQnMZtWZQXisXu5U2NSjv1twwCcLgwYU8sfh3N9/WeHTe0MS9drZc 865JdM+Ni7t5yrshXMBzUWIg83Vrfr8LZsGtFJdfNHbVPmZGjHhGL1582LXROu0NHFoq ujJiH15ZLpTogM7dmx5VMiIdWnoPidj3KcX8klt6quK33UAUFVsfH8Jb2TAwUB5y4hdJ yLYrclKWnGOwWw1WaZfY8NcjDOpmCW+0pumV31ms8sHKRhCRdGo1V1H1fmvYJaY8lgEQ xgoS3JFs+VpxjAYbwwUCQ1K7X092OnTOBHmTw7samSxgnmh42SAYwpKFHfkEW7ml5K2p HF0Q== X-Received: by 10.14.1.195 with SMTP id 43mr102751371eed.31.1356868777045; Sun, 30 Dec 2012 03:59:37 -0800 (PST) Received: from localhost (sun-0.pirko.cz. [84.16.102.25]) by mx.google.com with ESMTPS id z8sm78394550eeo.11.2012.12.30.03.59.29 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 30 Dec 2012 03:59:36 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, bhutchings@solarflare.com, faisal.latif@intel.com, shemminger@vyatta.com, fbl@redhat.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, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, ebiederm@xmission.com, joe@perches.com, amwang@redhat.com, nhorman@tuxdriver.com, john.r.fastabend@intel.com, pablo@netfilter.org Subject: [patch net-next 05/15] team: remove usage of netdev_set_master() Date: Sun, 30 Dec 2012 12:58:12 +0100 Message-Id: <1356868702-8144-6-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1356868702-8144-1-git-send-email-jiri@resnulli.us> References: <1356868702-8144-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQlySsRUp9rcr6UCfAGGmbMs+Vv3YeIJ2NJ61R4l0NIHrEjborydupA13arqRotuIEBxLwFA 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 918a901..3df5cc1 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1055,10 +1055,11 @@ static int team_port_add(struct team *team, struct net_device *port_dev) } } - err = netdev_set_master(port_dev, dev); + err = netdev_master_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, @@ -1091,9 +1092,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: @@ -1137,7 +1138,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);