From patchwork Sun Dec 30 11:58:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 208743 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 E243D2C00B0 for ; Sun, 30 Dec 2012 23:00:04 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754518Ab2L3MAB (ORCPT ); Sun, 30 Dec 2012 07:00:01 -0500 Received: from mail-ea0-f182.google.com ([209.85.215.182]:38441 "EHLO mail-ea0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754501Ab2L3MAA (ORCPT ); Sun, 30 Dec 2012 07:00:00 -0500 Received: by mail-ea0-f182.google.com with SMTP id a14so4970468eaa.41 for ; Sun, 30 Dec 2012 03:59:58 -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=ix52ltu0uGqbidhiosIn9D/z6gly3mC6Bwd44YAQmiM=; b=PmOycKZ1MywrdbRFYa+d6KCs1mzmwtsVFPVAVmOZwSF+l0OpbXi8BHOykvcaxN0uIt p5gVhpWxTdLoNGdjZunUJwjzgxX3UgbQWwVcerfGMzxe+HOSJ2ERonP2o5B9mM5+JdXj nb5prNYRLgEwiCiCTsYVuMvyAPG0UJbHE0wxU2dXrf5I/Z/jdo3/Ym10ohFRVp3YFUpP I86UmANBSD+ROn9gGyRCixHJCQrM1/nOhPTkepAJqwENF4tF3Rq/VrpQhWiu3OuOOGrv pMa9AwysxjIPBNEYQRFsHybWfmRJclneLzrBNN3Kkhm6QpZ8LTjGV1zd5+foSx8ByQke IRww== X-Received: by 10.14.174.198 with SMTP id x46mr102623719eel.23.1356868798699; Sun, 30 Dec 2012 03:59:58 -0800 (PST) Received: from localhost (sun-0.pirko.cz. [84.16.102.25]) by mx.google.com with ESMTPS id b49sm78473236eem.16.2012.12.30.03.59.50 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 30 Dec 2012 03:59:57 -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 07/15] netpoll: remove usage of dev->master Date: Sun, 30 Dec 2012 12:58:14 +0100 Message-Id: <1356868702-8144-8-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: ALoCoQnNQM6679w3dlZNGrmHZCmCYTfv23lQ6k4mDZDwm2pA8fHvsRyV81XVDvETNqIDxwWEX6jK Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Jiri Pirko --- net/core/netpoll.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 3151acf..d2bda8e 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -210,9 +210,12 @@ static void netpoll_poll_dev(struct net_device *dev) if (dev->flags & IFF_SLAVE) { if (ni) { - struct net_device *bond_dev = dev->master; + struct net_device *bond_dev; struct sk_buff *skb; - struct netpoll_info *bond_ni = rcu_dereference_bh(bond_dev->npinfo); + struct netpoll_info *bond_ni; + + bond_dev = netdev_master_upper_dev_get_rcu(dev); + bond_ni = rcu_dereference_bh(bond_dev->npinfo); while ((skb = skb_dequeue(&ni->arp_tx))) { skb->dev = bond_dev; skb_queue_tail(&bond_ni->arp_tx, skb); @@ -815,7 +818,7 @@ int netpoll_setup(struct netpoll *np) return -ENODEV; } - if (ndev->master) { + if (netdev_master_upper_dev_get(ndev)) { np_err(np, "%s is a slave device, aborting\n", np->dev_name); err = -EBUSY; goto put;