[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <5273B540.7010807@cogentembedded.com>
Date: Fri, 01 Nov 2013 18:05:52 +0400
From: Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
To: Jeff Kirsher <jeffrey.t.kirsher@...el.com>, davem@...emloft.net
CC: "Fujinaka, Todd" <todd.fujinaka@...el.com>, netdev@...r.kernel.org,
gospo@...hat.com, sassmann@...hat.com
Subject: Re: [net-next 3/6] igb: Don't let ethtool try to write to iNVM in
i210/i211
Hello.
On 01-11-2013 17:56, Jeff Kirsher wrote:
> From: "Fujinaka, Todd" <todd.fujinaka@...el.com>
> Don't let ethtool try to write to iNVM in i210/i211.
> This fixes an issue seen by Marek Vasut.
> Reported-by: Marek Vasut <marex@...x.de>
> Signed-off-by: Todd Fujinaka <todd.fujinaka@...el.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@...el.com>
> ---
> drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
> diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
> index 0ae3177..b918ba3 100644
> --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
> +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
> @@ -771,8 +771,10 @@ static int igb_set_eeprom(struct net_device *netdev,
> if (eeprom->len == 0)
> return -EOPNOTSUPP;
>
> - if (hw->mac.type == e1000_i211)
> + if ((hw->mac.type >= e1000_i210) &&
> + !igb_get_flash_presence_i210(hw)) {
> return -EOPNOTSUPP;
> + }
Why have you added {}?
WBR, Sergei
--
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
Powered by blists - more mailing lists