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 498B4C43381 for ; Fri, 22 Feb 2019 18:26:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1B8C72070B for ; Fri, 22 Feb 2019 18:26:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iZFLVSqr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727479AbfBVS0L (ORCPT ); Fri, 22 Feb 2019 13:26:11 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:41838 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726604AbfBVS0J (ORCPT ); Fri, 22 Feb 2019 13:26:09 -0500 Received: by mail-wr1-f66.google.com with SMTP id n2so3376371wrw.8 for ; Fri, 22 Feb 2019 10:26:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=arX+9vLIi0BfmjPu/rMDLK0le8Dhr83s5GwRXiG6HtY=; b=iZFLVSqrR5v9tVDUgQ4jrDQWxSFb6sO13ERPcsYdj4t7EiJUdTsHuoXPuCUtlSX4nU Pjwd5Ssxee1//783cbhdUcLZN9jN4CapwMCQ5MczxNal+0U/vdHEad/8CtoWxeHCwXTZ Dh5M5hZvYTig/omq7JeQaw3RxC9QOgnEd13hO81qcfc+HHEPgpTxjFsTZugTVZv7wGAH gQ+n27j7KEWNE/1v+mEDwz1QPDUxRNB8nOHebgk7PdlGRTmclzBaI8B6epnKgYNDnRkb d/9Cl3EZDoQymlvlgzE4y9dMvXFstpHKIOU9tfa1WyktkG2TkScnWhDS5PvtacgbiTFr s15g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=arX+9vLIi0BfmjPu/rMDLK0le8Dhr83s5GwRXiG6HtY=; b=CT91Bx6QPP/sGwnj810opjBOFiQ3iSqqYjJgoNTy6CX0G9H3DKiFG+L1STjd5jUu/d gH31j8B6nO01q7eLV4eXkTCHom+kCw2cE84g3w9dUI++S12Mwmo1GoZ+7djpqVrKLl94 qFnq4kpSGuMr4jr4cvaXRSfjSuE1rqtdSMgAAvPiw0HWls9x0/q/2hPQB9S/DD8uzO6p uoM5BNMpntGTI5XFs65hZHU8amowxeT+lxrOcrKGam58adBtXFymy3I9y2C3mu+/Udpu 4/J79o9UQtJULbSx8kSBbodFIRh6PGhkUTJd4E8a9gqb7iSaLGAtjRbDGsbIUiZCPWcd 1inw== X-Gm-Message-State: AHQUAubGdtiwuJD4Q/s7LdFjE/zs4U+/QawGtsD6W+D7JBcxB+uOkj/W E+TUnv2zdmN95/ev6qm2///0WCAR X-Google-Smtp-Source: AHgI3IaBUC31fUDl62NKBnk2mK6PS5KRdF5X6uOzR68D0SwEOsQV3muKF3HNOV2Y14Xl/M8pwpZjJQ== X-Received: by 2002:adf:d4cd:: with SMTP id w13mr3940152wrk.35.1550859967646; Fri, 22 Feb 2019 10:26:07 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:881a:e62a:a902:5b57? (p200300EA8BF1E200881AE62AA9025B57.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:881a:e62a:a902:5b57]) by smtp.googlemail.com with ESMTPSA id 12sm4191255wme.25.2019.02.22.10.26.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Feb 2019 10:26:06 -0800 (PST) From: Heiner Kallweit Subject: [PATCH v2 net-next] net: phy: improve definition of __ETHTOOL_LINK_MODE_MASK_NBITS To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" Message-ID: <3ae0478b-810f-904e-e128-7e0a57c7255c@gmail.com> Date: Fri, 22 Feb 2019 19:25:59 +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. v2: - rebased 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 378c52308..3652b239d 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, @@ -1469,14 +1476,8 @@ enum ethtool_link_mode_bit_indices { ETHTOOL_LINK_MODE_200000baseDR4_Full_BIT = 65, ETHTOOL_LINK_MODE_200000baseCR4_Full_BIT = 66, - /* 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_200000baseCR4_Full_BIT, + /* must be last entry */ + __ETHTOOL_LINK_MODE_MASK_NBITS }; #define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) \ -- 2.20.1