* [PATCH 2.6.27] myri10ge: myri10ge_fw_name also overrides the rss firmware
@ 2008-08-13 19:05 Brice Goglin
2008-08-14 8:28 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Brice Goglin @ 2008-08-13 19:05 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev
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;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 2.6.27] myri10ge: myri10ge_fw_name also overrides the rss firmware
2008-08-13 19:05 [PATCH 2.6.27] myri10ge: myri10ge_fw_name also overrides the rss firmware Brice Goglin
@ 2008-08-14 8:28 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2008-08-14 8:28 UTC (permalink / raw)
To: Brice Goglin; +Cc: netdev
Brice Goglin wrote:
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-08-14 8:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-13 19:05 [PATCH 2.6.27] myri10ge: myri10ge_fw_name also overrides the rss firmware Brice Goglin
2008-08-14 8:28 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).