From patchwork Sat Dec 29 10:38:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 208647 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 1DE682C00EC for ; Sat, 29 Dec 2012 21:39:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752846Ab2L2KjT (ORCPT ); Sat, 29 Dec 2012 05:39:19 -0500 Received: from mail-ea0-f182.google.com ([209.85.215.182]:55316 "EHLO mail-ea0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752808Ab2L2KjR (ORCPT ); Sat, 29 Dec 2012 05:39:17 -0500 Received: by mail-ea0-f182.google.com with SMTP id a14so4699273eaa.41 for ; Sat, 29 Dec 2012 02:39:16 -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=bwzWexeRHdeI52ebDEwSnOaYwiBkAqC5lDaFiAMfZcQ=; b=SqordRJv6hqRjCBTwknRb5F24vj0zIQUKXV9KmYkrc+UNAv4p+UQ7YSQupLZMdfiAc 1AS+EEVMMIkD5YC/eZy5WLcJe9owaQ4QB76UNAy7Vrww1o3N4DYW8m/BgSk2cFSYZoKa h2LiABGS2kBHkUKxSS+i4YXHWLBouw4Y7rd63IFRtv/I8xMC2eGMC49HDdua29VxO9m8 UkPX1GWh1SpmNAnUiSPHqYB404WOTG4jb1XgfbNenYOnOKbsoAe/8nffbAv2zDQEDU4b cuqKuAh6/GVufiMSXsa13FZHXMnIpq8t08+i75ZoTIWTjivlooIUcob2TfZ8lfv+SieF 9ftA== X-Received: by 10.14.203.2 with SMTP id e2mr94224487eeo.20.1356777555968; Sat, 29 Dec 2012 02:39:15 -0800 (PST) Received: from localhost (sun-0.pirko.cz. [84.16.102.25]) by mx.google.com with ESMTPS id r1sm71496601eeo.2.2012.12.29.02.39.13 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 29 Dec 2012 02:39:15 -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 08/15] cxgb3: remove usage of dev->master Date: Sat, 29 Dec 2012 11:38:35 +0100 Message-Id: <1356777522-19652-9-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1356777522-19652-1-git-send-email-jiri@resnulli.us> References: <1356777522-19652-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQmJU3sJ+tuZJYd76oJ7pU0LwlqbuzLAdSW9HKJF8FLHMIz4Gd/U4xYmhj+CyrfGLvkzZ3Lr Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Jiri Pirko --- drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c index 942dace..3f1f501 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c @@ -182,14 +182,17 @@ static struct net_device *get_iff_from_mac(struct adapter *adapter, struct net_device *dev = adapter->port[i]; if (!memcmp(dev->dev_addr, mac, ETH_ALEN)) { + rcu_read_lock(); if (vlan && vlan != VLAN_VID_MASK) { - rcu_read_lock(); dev = __vlan_find_dev_deep(dev, vlan); - rcu_read_unlock(); } else if (netif_is_bond_slave(dev)) { - while (dev->master) - dev = dev->master; + struct net_device *upper_dev; + + while ((upper_dev = + netdev_master_upper_dev_get_rcu(dev))) + dev = upper_dev; } + rcu_read_unlock(); return dev; } }