diff options
Diffstat (limited to 'drivers/net/myri10ge')
-rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index f1de38f8b742..5d76cd09e246 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c | |||
@@ -3548,7 +3548,11 @@ static void myri10ge_probe_slices(struct myri10ge_priv *mgp) | |||
3548 | 3548 | ||
3549 | /* try to load the slice aware rss firmware */ | 3549 | /* try to load the slice aware rss firmware */ |
3550 | old_fw = mgp->fw_name; | 3550 | old_fw = mgp->fw_name; |
3551 | if (old_fw == myri10ge_fw_aligned) | 3551 | if (myri10ge_fw_name != NULL) { |
3552 | dev_info(&mgp->pdev->dev, "overriding rss firmware to %s\n", | ||
3553 | myri10ge_fw_name); | ||
3554 | mgp->fw_name = myri10ge_fw_name; | ||
3555 | } else if (old_fw == myri10ge_fw_aligned) | ||
3552 | mgp->fw_name = myri10ge_fw_rss_aligned; | 3556 | mgp->fw_name = myri10ge_fw_rss_aligned; |
3553 | else | 3557 | else |
3554 | mgp->fw_name = myri10ge_fw_rss_unaligned; | 3558 | mgp->fw_name = myri10ge_fw_rss_unaligned; |