netdev - Re: [PATCH 1/2] net/usb/ax88179_178a: Use common code in ax88179_chk

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:   Sat, 10 Mar 2018 10:41:57 -0800
From:   Joe Perches <joe@...ches.com>
To:     SF Markus Elfring <elfring@...rs.sourceforge.net>,
        linux-usb@...r.kernel.org, netdev@...r.kernel.org,
        "Andrew F. Davis" <afd@...com>,
        Bjørn Mork <bjorn@...k.no>,
        "David S. Miller" <davem@...emloft.net>,
        Philippe Reynes <tremyfr@...il.com>,
        Yuval Shaia <yuval.shaia@...cle.com>
Cc:     LKML <linux-kernel@...r.kernel.org>,
        kernel-janitors@...r.kernel.org
Subject: Re: [PATCH 1/2] net/usb/ax88179_178a: Use common code in
 ax88179_chk_eee()

On Sat, 2018-03-10 at 19:24 +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@...rs.sourceforge.net>
> Date: Sat, 10 Mar 2018 18:22:43 +0100
> 
> Adjust a jump target so that a bit of common code can be better reused
> at the end of this function.

Please stop mindlessly sending patching Markus.

How about looking at the code being modified and
thinking about what it does?

Try unindenting the block by reversing the first test
and using the same goto set_inactive.

Look at the last & tests
+		if (!(lp & adv & supported))
and see if it should use && or be more simple to read
by using
	if (!condition || !

> ---
>  drivers/net/usb/ax88179_178a.c | 34 +++++++++++-----------------------
>  1 file changed, 11 insertions(+), 23 deletions(-)
> 
> diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c
> index f32261ecd215..e4b0baa98e9a 100644
> --- a/drivers/net/usb/ax88179_178a.c
> +++ b/drivers/net/usb/ax88179_178a.c
> @@ -689,49 +689,37 @@ static int ax88179_chk_eee(struct usbnet *dev)
>  		eee_cap = ax88179_phy_read_mmd_indirect(dev,
>  							MDIO_PCS_EEE_ABLE,
>  							MDIO_MMD_PCS);
> -		if (eee_cap < 0) {
> -			priv->eee_active = 0;
> -			return false;
> -		}
> +		if (eee_cap < 0)
> +			goto set_inactive;
>  
>  		cap = mmd_eee_cap_to_ethtool_sup_t(eee_cap);
> -		if (!cap) {
> -			priv->eee_active = 0;
> -			return false;
> -		}
> +		if (!cap)
> +			goto set_inactive;
>  
>  		eee_lp = ax88179_phy_read_mmd_indirect(dev,
>  						       MDIO_AN_EEE_LPABLE,
>  						       MDIO_MMD_AN);
> -		if (eee_lp < 0) {
> -			priv->eee_active = 0;
> -			return false;
> -		}
> +		if (eee_lp < 0)
> +			goto set_inactive;
>  
>  		eee_adv = ax88179_phy_read_mmd_indirect(dev,
>  							MDIO_AN_EEE_ADV,
>  							MDIO_MMD_AN);
> -
> -		if (eee_adv < 0) {
> -			priv->eee_active = 0;
> -			return false;
> -		}
> +		if (eee_adv < 0)
> +			goto set_inactive;
>  
>  		adv = mmd_eee_adv_to_ethtool_adv_t(eee_adv);
>  		lp = mmd_eee_adv_to_ethtool_adv_t(eee_lp);
>  		supported = (ecmd.speed == SPEED_1000) ?
>  			     SUPPORTED_1000baseT_Full :
>  			     SUPPORTED_100baseT_Full;
> -
> -		if (!(lp & adv & supported)) {
> -			priv->eee_active = 0;
> -			return false;
> -		}
> +		if (!(lp & adv & supported))
> +			goto set_inactive;
>  
>  		priv->eee_active = 1;
>  		return true;
>  	}
> -
> +set_inactive:
>  	priv->eee_active = 0;
>  	return false;
>  }