From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6DD33C43381 for ; Thu, 21 Feb 2019 12:41:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3CE8C2086C for ; Thu, 21 Feb 2019 12:41:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="DRRwBr5O" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727983AbfBUMk7 (ORCPT ); Thu, 21 Feb 2019 07:40:59 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:34022 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725385AbfBUMk6 (ORCPT ); Thu, 21 Feb 2019 07:40:58 -0500 Received: by mail-wr1-f66.google.com with SMTP id f14so29960750wrg.1 for ; Thu, 21 Feb 2019 04:40:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=yyIdGmL+58nH0xn2GlVeMZdm3ag1AJHO5dfJFCrdR0U=; b=DRRwBr5Ogd82BxCXX2nPQkHPG13kkVPFLELldwDTBrQ3ruSJT0SHVDAGJlI6p/c2L5 +ckHNmb8sIfKQRXHrRQFpC2D/smpfQcJYVN3NW4OGfn9srcH7IU4Gj6B1hIIVS7eU/Dw kGHcvbWUzpxPFqzcgSFI8PhWqY9gFcBtDGc3nIZ5765seBgw+QuXvXTkXEa3Y5o2CHVF JMPHOEcHCHhRt7VLqAzdskzA6l3HfbuItRtAwwfvw0X0Bbf/R9JA1RLvO4rhHqgP8FPQ RBg6yfAq7Lkle11AeaDUvKn/2TL8sG83YN1yLFRpSd/Th2lwqc0gIgNv3bvGy/HTb2sW vHow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=yyIdGmL+58nH0xn2GlVeMZdm3ag1AJHO5dfJFCrdR0U=; b=JbpEKgmS9k2KyTBQ8CVMxmBq6n5zxsxZcVuXLlCMFv8S04qmvKi/AsljueohQG92M0 c3jCgMliwqUQ1t80QgKHEaUvMnydZdZ7PYOOUHojY0UjFlTcAJFSMZqsFfQur70u+Vhv IO282JScgKWHVLna3kyEOzQPXRbXFacZdssC1bPz3ZxI39Qcw6vwJYFQaEoObS1w0XCP vRSPgbYdMJ57W0dCWd0MkJKgUTNq1ZQe0hA/8/14U6Ajl5zOi/rnbN4MQzKEc5Z6DYBz xaxgRMMB70ZQ0Et1OonetOHsHkc55fwHxpWSlEO9wTtXzTFTBhaZMiyKhHi/6wSUDfSC 2O1g== X-Gm-Message-State: AHQUAuasi9IOM7+WyCsqO/RC9uMuNCUQgGcR/ayxcm6THrOyxWC73Y3I 4Bg1JmKpIZHZPC6mHFUIQ6yPswcC+rU= X-Google-Smtp-Source: AHgI3IbYcwO/Lo5887v9S3hMOdmrFAwPoGwT31540YhBYXWpsBK0NVfFUh5burfH/s9s4mNPrWhR0Q== X-Received: by 2002:a1c:a756:: with SMTP id q83mr5750879wme.8.1550752856812; Thu, 21 Feb 2019 04:40:56 -0800 (PST) Received: from localhost (ip-89-102-139-73.net.upcbroadband.cz. [89.102.139.73]) by smtp.gmail.com with ESMTPSA id m15sm18711101wrx.30.2019.02.21.04.40.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Feb 2019 04:40:56 -0800 (PST) Date: Thu, 21 Feb 2019 13:31:17 +0100 From: Jiri Pirko To: Eran Ben Elisha Cc: netdev@vger.kernel.org, "David S. Miller" , Jiri Pirko , Aya Levin Subject: Re: [PATCH net-next 1/2] devlink: Rename devlink health attributes Message-ID: <20190221123117.GN2312@nanopsycho> References: <1550751122-2788-1-git-send-email-eranbe@mellanox.com> <1550751122-2788-2-git-send-email-eranbe@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1550751122-2788-2-git-send-email-eranbe@mellanox.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Thu, Feb 21, 2019 at 01:12:01PM CET, eranbe@mellanox.com wrote: >From: Aya Levin > >Rename devlink health attributes for better reflect the attributes use. >Add COUNT prefix on error counter attribute and recovery counter >attribute. > >Fixes: 7afe335a8bed ("devlink: Add health get command") >Signed-off-by: Aya Levin >Signed-off-by: Eran Ben Elisha >Acked-by: Jiri Pirko >--- > include/uapi/linux/devlink.h | 4 ++-- > net/core/devlink.c | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > >diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h >index 53de8802a000..5bb4ea67d84f 100644 >--- a/include/uapi/linux/devlink.h >+++ b/include/uapi/linux/devlink.h >@@ -323,8 +323,8 @@ enum devlink_attr { > DEVLINK_ATTR_HEALTH_REPORTER, /* nested */ > DEVLINK_ATTR_HEALTH_REPORTER_NAME, /* string */ > DEVLINK_ATTR_HEALTH_REPORTER_STATE, /* u8 */ >- DEVLINK_ATTR_HEALTH_REPORTER_ERR, /* u64 */ >- DEVLINK_ATTR_HEALTH_REPORTER_RECOVER, /* u64 */ >+ DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT, /* u64 */ >+ DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT, /* u64 */ Just note, this is still in net-next only, so it is okay to change it. > DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS, /* u64 */ > DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD, /* u64 */ > DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER, /* u8 */ >diff --git a/net/core/devlink.c b/net/core/devlink.c >index 04d98550c78c..5135997ecbe7 100644 >--- a/net/core/devlink.c >+++ b/net/core/devlink.c >@@ -4650,10 +4650,10 @@ devlink_nl_health_reporter_fill(struct sk_buff *msg, > if (nla_put_u8(msg, DEVLINK_ATTR_HEALTH_REPORTER_STATE, > reporter->health_state)) > goto reporter_nest_cancel; >- if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_ERR, >+ if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT, > reporter->error_count, DEVLINK_ATTR_PAD)) > goto reporter_nest_cancel; >- if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_RECOVER, >+ if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT, > reporter->recovery_count, DEVLINK_ATTR_PAD)) > goto reporter_nest_cancel; > if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD, >-- >2.17.1 >