From patchwork Wed Jun 17 21:53:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 485721 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 2467D140518 for ; Thu, 18 Jun 2015 07:51:28 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=njb9CMhk; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757371AbbFQVvY (ORCPT ); Wed, 17 Jun 2015 17:51:24 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:34904 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753197AbbFQVvU (ORCPT ); Wed, 17 Jun 2015 17:51:20 -0400 Received: by pacyx8 with SMTP id yx8so45481179pac.2 for ; Wed, 17 Jun 2015 14:51:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yzRAcR906oEq3qIQmQ5QCrD8TaCG+GrbfgFGXNYOVpU=; b=njb9CMhkgDUuTZPAwNjDmYb9Xtj7IZa1gi27SiNw72xvQhh/MjYz1ASppyITJTzntU 82l1eE3g4hUfa43YkKAsr6Mm/RXEt12wAeDRAC5nevHi/GJOV/3DYsovoiBX17/BIMtK 6dExdeonLmv3Y88Mi9DxqSwyppRmZX9LP1RZnKMoVKSNucuTw9M0lsEeAeVwNoERgnvA X2eko9f7EvFDsitv7+om5N+AuKwZ2iRBTBBeti1kWLh4Z5JQfmtVSd8vZ/aD4zWrfm+C FS3RVTyzoJUIjJYC0jAJWp5CgmvXnBY0wr2YaXrJfP9k9QgmEsA6suMjvmag8qtpwG8l Zgdg== X-Received: by 10.66.249.198 with SMTP id yw6mr14597177pac.149.1434577879635; Wed, 17 Jun 2015 14:51:19 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.143]) by mx.google.com with ESMTPSA id gc5sm5697349pbb.53.2015.06.17.14.51.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jun 2015 14:51:19 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org Cc: jiri@resnulli.us, simon.horman@netronome.com, roopa@cumulusnetworks.com, ronen.arad@intel.com, john.r.fastabend@intel.com, andrew@lunn.ch, f.fainelli@gmail.com, linux@roeck-us.net, davidch@broadcom.com, stephen@networkplumber.org Subject: [RFC PATCH net-next v2 2/5] net: add phys ID compare helper to test if two IDs are the same Date: Wed, 17 Jun 2015 14:53:11 -0700 Message-Id: <1434577994-22409-3-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1434577994-22409-1-git-send-email-sfeldma@gmail.com> References: <1434577994-22409-1-git-send-email-sfeldma@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Scott Feldman Signed-off-by: Scott Feldman --- include/linux/netdevice.h | 7 +++++++ net/switchdev/switchdev.c | 8 ++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 7be616e1..63090ce 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -766,6 +766,13 @@ struct netdev_phys_item_id { unsigned char id_len; }; +static inline bool netdev_phys_item_id_same(struct netdev_phys_item_id *a, + struct netdev_phys_item_id *b) +{ + return ((a->id_len == b->id_len) && + (memcmp(a->id, b->id, a->id_len) == 0)); +} + typedef u16 (*select_queue_fallback_t)(struct net_device *dev, struct sk_buff *skb); diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index a5d0f8e..00c67a5 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -791,13 +791,9 @@ static struct net_device *switchdev_get_dev_by_nhs(struct fib_info *fi) if (switchdev_port_attr_get(dev, &attr)) return NULL; - if (nhsel > 0) { - if (prev_attr.u.ppid.id_len != attr.u.ppid.id_len) + if (nhsel > 0 && + !netdev_phys_item_id_same(&prev_attr.u.ppid, &attr.u.ppid)) return NULL; - if (memcmp(prev_attr.u.ppid.id, attr.u.ppid.id, - attr.u.ppid.id_len)) - return NULL; - } prev_attr = attr; }