lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

myri10ge: myri10ge_fw_name also overrides the rss firmware

Browse Source 
When myri10ge_fw_name is given, use it to override the rss firmware
name as well.

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Brice Goglin
2008-08-13 21:05:52 +02:00
committed by Jeff Garzik
parent 7144decb0f
commit 13b2738cbb
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/myri10ge/myri10ge.c
View File

@@ -3548,7 +3548,11 @@ static void myri10ge_probe_slices(struct myri10ge_priv *mgp)
/* try to load the slice aware rss firmware */ /* try to load the slice aware rss firmware */
old_fw = mgp->fw_name; 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; mgp->fw_name = myri10ge_fw_rss_aligned;
else else
mgp->fw_name = myri10ge_fw_rss_unaligned; mgp->fw_name = myri10ge_fw_rss_unaligned;