From patchwork Thu Jul 16 08:04:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 496575 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 93AA0140285 for ; Thu, 16 Jul 2015 18:02:51 +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=IA4isLfz; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754065AbbGPICs (ORCPT ); Thu, 16 Jul 2015 04:02:48 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:32858 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754024AbbGPICp (ORCPT ); Thu, 16 Jul 2015 04:02:45 -0400 Received: by padck2 with SMTP id ck2so38614111pad.0 for ; Thu, 16 Jul 2015 01:02:45 -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=k6E9JifILSDGPjLlI00Li5TTvOPFM1P7PJ6fHRo850Q=; b=IA4isLfzb3nSpoL7lvqua2/rQ64PUC1OaaEiNMcBUOwqW72q/WXLNgioHp1sPjsuhf bk/lpKxX7ThcDK3VmxZyIpEDacUQWYhHOO8POHTVMiNCrx4Owih2YOIApa/wzL/mhBIO Vrt1b+QVyTsuUnpu/Zrd4luJNjiyShJCpvJpQYUvWXTU8i9dXPwj8ZB2zAmhojPj0wox VwYwjQzP2ExaKelxQD3e1f98XMDviZRvfwoo+KhQOXW6oerUFuRxQTv2Ct6+gjm9qYLp CVT5lhj57pXjBz/n7WK6NBa26Y3zx50cM4AifRUPzAvWAEWpMQY+kv3U03D65GkIdfIW cQmQ== X-Received: by 10.68.131.1 with SMTP id oi1mr15903234pbb.129.1437033765093; Thu, 16 Jul 2015 01:02:45 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.143]) by smtp.gmail.com with ESMTPSA id f4sm6940496pdc.95.2015.07.16.01.02.43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Jul 2015 01:02:44 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org Cc: jiri@resnulli.us, roopa@cumulusnetworks.com, simon.horman@netronome.com Subject: [PATCH net-next v2 2/5] net: add phys ID compare helper to test if two IDs are the same Date: Thu, 16 Jul 2015 01:04:54 -0700 Message-Id: <1437033897-8050-3-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1437033897-8050-1-git-send-email-sfeldma@gmail.com> References: <1437033897-8050-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 Acked-by: Jiri Pirko --- 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 8364f29..607b5f4 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 9f2add3..4e5bba5 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -910,13 +910,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; }