netdev - Re: [patch net-next-2.6] br: remove redundant check and init

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]

Message-ID: <20110901090741.4ce49e76@nehalam.ftrdhcpuser.net>
Date:	Thu, 1 Sep 2011 09:07:41 -0700
From:	Stephen Hemminger <shemminger@...tta.com>
To:	Jiri Pirko <jpirko@...hat.com>
Cc:	netdev@...r.kernel.org, davem@...emloft.net,
	eric.dumazet@...il.com, bridge@...ts.linux-foundation.org
Subject: Re: [patch net-next-2.6] br: remove redundant check and init

On Thu,  1 Sep 2011 15:29:38 +0200
Jiri Pirko <jpirko@...hat.com> wrote:

> Since these checks and initialization are done in
> dev_ethtool_get_settings called later on, remove this redundancy.
> 
> Signed-off-by: Jiri Pirko <jpirko@...hat.com>
> ---
>  net/bridge/br_if.c |   24 +++++++++++-------------
>  1 files changed, 11 insertions(+), 13 deletions(-)
> 
> diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
> index 2cdf007..b365bba 100644
> --- a/net/bridge/br_if.c
> +++ b/net/bridge/br_if.c
> @@ -33,20 +33,18 @@
>   */
>  static int port_cost(struct net_device *dev)
>  {
> -	if (dev->ethtool_ops && dev->ethtool_ops->get_settings) {
> -		struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET, };
> -
> -		if (!dev_ethtool_get_settings(dev, &ecmd)) {
> -			switch (ethtool_cmd_speed(&ecmd)) {
> -			case SPEED_10000:
> -				return 2;
> -			case SPEED_1000:
> -				return 4;
> -			case SPEED_100:
> -				return 19;
> -			case SPEED_10:
> -				return 100;
> -			}
> +	struct ethtool_cmd ecmd;
> +
> +	if (!dev_ethtool_get_settings(dev, &ecmd)) {
> +		switch (ethtool_cmd_speed(&ecmd)) {
> +		case SPEED_10000:
> +			return 2;
> +		case SPEED_1000:
> +			return 4;
> +		case SPEED_100:
> +			return 19;
> +		case SPEED_10:
> +			return 100;
>  		}
>  	}
>  

Yeah, this code predates when ethtool was sane about ops

Acked-by: Stephen Hemminger <shemminger@...tta.com>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html