From patchwork Wed Jul 8 23:16:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 493188 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 DA16F1409A0 for ; Thu, 9 Jul 2015 09:14:26 +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=RTUH/LOc; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752016AbbGHXOX (ORCPT ); Wed, 8 Jul 2015 19:14:23 -0400 Received: from mail-pd0-f174.google.com ([209.85.192.174]:36293 "EHLO mail-pd0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751364AbbGHXOP (ORCPT ); Wed, 8 Jul 2015 19:14:15 -0400 Received: by pddu5 with SMTP id u5so66028433pdd.3 for ; Wed, 08 Jul 2015 16:14:14 -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=w7AWmVdWJxrN7OC5S2UVfI8Q0z1LoxsoRPsZrsTZUF0=; b=RTUH/LOcDwlvh66fXhToShfgeA7x2pxOQuhD/d4xcj5q3O69XutpPow8wSg8IKHoEx YliGwsIBrBIGKTMaXeeSEh4twg1ajd4ntBsFNKtY/l1ZZXytl+uRhVpCC1+/pbtv75SM 8nUPPEiNDVcwT/K7er45FyR8m8jCCEemJpucUQ0PbyWt4bEk0wIP/zai2na12Ojh0aIK 3h67cnIxbz+8Kp2NUX4Il9xZzvJmd1F5sjqKuphwtwv2Lfp1US7ERo8T9n69KW7YlVTB gcN/ptX8UOICCoXwxwkEXOiieypgB5GOHSjmncCu4mcFGKgKDQO3pwVVD2zNS381s9SX AXQw== X-Received: by 10.68.93.196 with SMTP id cw4mr25100304pbb.36.1436397254485; Wed, 08 Jul 2015 16:14:14 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.143]) by smtp.gmail.com with ESMTPSA id dc8sm3673599pdb.23.2015.07.08.16.14.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jul 2015 16:14:13 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org Cc: jiri@resnulli.us, roopa@cumulusnetworks.com Subject: [PATCH net-next 2/5] net: add phys ID compare helper to test if two IDs are the same Date: Wed, 8 Jul 2015 16:16:40 -0700 Message-Id: <1436397403-62412-3-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1436397403-62412-1-git-send-email-sfeldma@gmail.com> References: <1436397403-62412-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..89db412 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 84f77a0..e16586f 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -906,13 +906,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; }