Brice Goglin wrote:
quoted text
> When myri10ge_fw_name is given, use it to override the rss firmware
> name as well.
> 
> Signed-off-by: Brice Goglin <brice@myri.com>
> ---
>  drivers/net/myri10ge/myri10ge.c |    6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> Index: linux-2.6/drivers/net/myri10ge/myri10ge.c
> ===================================================================
> --- linux-2.6.orig/drivers/net/myri10ge/myri10ge.c	2008-08-12 16:43:26.000000000 +0200
> +++ linux-2.6/drivers/net/myri10ge/myri10ge.c	2008-08-12 16:43:53.000000000 +0200
> @@ -3548,7 +3548,11 @@
>  
>  	/* try to load the slice aware rss firmware */
>  	old_fw = mgp->fw_name;
> -	if (old_fw == myri10ge_fw_aligned)
> +	if (myri10ge_fw_name != NULL) {
> +		dev_info(&mgp->pdev->dev, "overriding rss firmware to %s\n",
> +			 myri10ge_fw_name);
> +		mgp->fw_name = myri10ge_fw_name;
> +	} else if (old_fw == myri10ge_fw_aligned)
>  		mgp->fw_name = myri10ge_fw_rss_aligned;
>  	else
>  		mgp->fw_name = myri10ge_fw_rss_unaligned;
> 
> 
> --

applied


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html