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=-6.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS 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 8017DC43381 for ; Mon, 18 Feb 2019 20:43:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 474D821479 for ; Mon, 18 Feb 2019 20:43:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XmkUFqf/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728272AbfBRUnq (ORCPT ); Mon, 18 Feb 2019 15:43:46 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:43511 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725844AbfBRUnp (ORCPT ); Mon, 18 Feb 2019 15:43:45 -0500 Received: by mail-wr1-f66.google.com with SMTP id d17so5403926wre.10 for ; Mon, 18 Feb 2019 12:43:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=0/HYsk0M5YUijsuUxBr+4q9rAw76I/Gzx7qivtH+eYc=; b=XmkUFqf/K+OcjaqzZRy/sjUvC3JwiKSFi3zAyW/mVGk2a4AgeXhpbovMo0/cX7qRhL M++1177hxo4Wtjzf0krle8z7y8CmHsjYdNQnCVSRzq8nBog1MacLPWQo+PalAidLXhIZ 23MoW/as/3oHNuM3Bnx0OE/v8sicEVjmZfAtBUe+PaCeuZgFJbbvH6CnYPk2l3r+AoQe g+ROSTpkkB6Jzv26XqXrF7CxUaddgJsDlFF1pJOal8S7cLjx5xEmGl0YukYhNrFFkus/ JppUaN7c0OwZTQKNHtCClUYkGUvVZlYlorB1LhHrbyv4JrevPUmpSH6JCHbqp41Q4xXL iFmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=0/HYsk0M5YUijsuUxBr+4q9rAw76I/Gzx7qivtH+eYc=; b=j/4MR6jdKFzUKu3w+RRH90gsjWmP50/h0otJBlyfselNLUp0vivgnz3Irnm24J1lqr xSS0Udh0HZLbQe2gcAJ8nuY+CNxw/FDVOuTFS9wX2uKmzsQ5pEodJbkstmWlbQRZ8Oxo IdzkxoxNpfXFHpvpazJQbaJxlmBvnsVK/EYZUCs9of73sy7NBq/cdujPIACz0l5gFQ7o FBN4UvzL9rUbfs4aX9/uQlEhF0LykZ4rNFg2rMalhqj0cJ1+ZUM6GNozmlO5pgNy6dez V4biM9t996oFVmnUpyMLL57Bx6wH5AuWEEnaCZ8myHHwMzbE3MR10pVpFXMNHYwMCIMt m7sA== X-Gm-Message-State: AHQUAuaFu5s4W6+jqZArZ6ZP5DgkR53YQ2B+BtqE2Jt4Wk4+ruYql12h P0OrMTwJ4gMahNYpYHL7Cxz4Mmp+ X-Google-Smtp-Source: AHgI3IYgGODMy7qCHOAtPY9nKA6I8JtjuTrn7lqrYOfwYxUF5qLBOdHbg3wKCZVXVhHUBs6BOqNeiA== X-Received: by 2002:a5d:6209:: with SMTP id y9mr295749wru.140.1550522623877; Mon, 18 Feb 2019 12:43:43 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:71d7:c708:89b6:a86? (p200300EA8BF1E20071D7C70889B60A86.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:71d7:c708:89b6:a86]) by smtp.googlemail.com with ESMTPSA id k20sm28755950wre.41.2019.02.18.12.43.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Feb 2019 12:43:42 -0800 (PST) To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" From: Heiner Kallweit Subject: [PATCH net-next] net: phy: improve definition of __ETHTOOL_LINK_MODE_MASK_NBITS Message-ID: Date: Mon, 18 Feb 2019 21:43:31 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The way to define __ETHTOOL_LINK_MODE_MASK_NBITS seems to be overly complicated, go with a standard approach instead. Whilst we're at it, move the comment to the right place. Signed-off-by: Heiner Kallweit --- include/linux/ethtool.h | 4 ---- include/uapi/linux/ethtool.h | 17 +++++++++-------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index 19a8de532..e6ebc9761 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -98,10 +98,6 @@ static inline u32 ethtool_rxfh_indir_default(u32 index, u32 n_rx_rings) return index % n_rx_rings; } -/* number of link mode bits/ulongs handled internally by kernel */ -#define __ETHTOOL_LINK_MODE_MASK_NBITS \ - (__ETHTOOL_LINK_MODE_LAST + 1) - /* declare a link mode bitmap */ #define __ETHTOOL_DECLARE_LINK_MODE_MASK(name) \ DECLARE_BITMAP(name, __ETHTOOL_LINK_MODE_MASK_NBITS) diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h index 17be76aeb..17128eed3 100644 --- a/include/uapi/linux/ethtool.h +++ b/include/uapi/linux/ethtool.h @@ -1432,6 +1432,13 @@ enum ethtool_link_mode_bit_indices { ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT = 29, ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT = 30, ETHTOOL_LINK_MODE_25000baseCR_Full_BIT = 31, + + /* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit + * 31. Please do NOT define any SUPPORTED_* or ADVERTISED_* + * macro for bits > 31. The only way to use indices > 31 is to + * use the new ETHTOOL_GLINKSETTINGS/ETHTOOL_SLINKSETTINGS API. + */ + ETHTOOL_LINK_MODE_25000baseKR_Full_BIT = 32, ETHTOOL_LINK_MODE_25000baseSR_Full_BIT = 33, ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT = 34, @@ -1454,14 +1461,8 @@ enum ethtool_link_mode_bit_indices { ETHTOOL_LINK_MODE_FEC_RS_BIT = 50, ETHTOOL_LINK_MODE_FEC_BASER_BIT = 51, - /* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit - * 31. Please do NOT define any SUPPORTED_* or ADVERTISED_* - * macro for bits > 31. The only way to use indices > 31 is to - * use the new ETHTOOL_GLINKSETTINGS/ETHTOOL_SLINKSETTINGS API. - */ - - __ETHTOOL_LINK_MODE_LAST - = ETHTOOL_LINK_MODE_FEC_BASER_BIT, + /* must be last entry */ + __ETHTOOL_LINK_MODE_MASK_NBITS }; #define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) \ -- 2.20.1