linux-kernel - Re: [PATCH v2 2/2] net: mii: make mii_ethtool

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 18 Aug 2021 17:59:25 +0300
From:   Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To:     Pavel Skripkin <paskripkin@...il.com>
Cc:     davem@...emloft.net, kuba@...nel.org,
        christophe.jaillet@...adoo.fr, kaixuxia@...cent.com,
        netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 2/2] net: mii: make mii_ethtool_gset() return void

On Wed, Aug 18, 2021 at 05:18:55PM +0300, Pavel Skripkin wrote:
> mii_ethtool_gset() does not return any errors. Since there is no users

there are

> of this function that rely on its return value, it can be
> made void.
> 
> Signed-off-by: Pavel Skripkin <paskripkin@...il.com>
> ---
> 
> Changes in v2:
> 	inverted the order of patches
> 
> ---
>  drivers/net/mii.c   | 5 +----
>  include/linux/mii.h | 2 +-
>  2 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/mii.c b/drivers/net/mii.c
> index 779c3a96dba7..3e7823267a3b 100644
> --- a/drivers/net/mii.c
> +++ b/drivers/net/mii.c
> @@ -50,9 +50,8 @@ static u32 mii_get_an(struct mii_if_info *mii, u16 addr)
>   * The @ecmd parameter is expected to have been cleared before calling
>   * mii_ethtool_gset().

>   *

This line should gone as well.

> - * Returns 0 for success, negative on error.
>   */
> -int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd)
> +void mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd)
>  {
>  	struct net_device *dev = mii->dev;
>  	u16 bmcr, bmsr, ctrl1000 = 0, stat1000 = 0;
> @@ -131,8 +130,6 @@ int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd)
>  	mii->full_duplex = ecmd->duplex;
>  
>  	/* ignore maxtxpkt, maxrxpkt for now */
> -
> -	return 0;
>  }
>  
>  /**
> diff --git a/include/linux/mii.h b/include/linux/mii.h
> index 219b93cad1dd..12ea29e04293 100644
> --- a/include/linux/mii.h
> +++ b/include/linux/mii.h
> @@ -32,7 +32,7 @@ struct mii_if_info {
>  
>  extern int mii_link_ok (struct mii_if_info *mii);
>  extern int mii_nway_restart (struct mii_if_info *mii);
> -extern int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);
> +extern void mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);
>  extern void mii_ethtool_get_link_ksettings(
>  	struct mii_if_info *mii, struct ethtool_link_ksettings *cmd);
>  extern int mii_ethtool_sset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);
> -- 
> 2.32.0
> 

-- 
With Best Regards,
Andy Shevchenko