Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13b2738c authored by Brice Goglin's avatar Brice Goglin Committed by Jeff Garzik
Browse files

myri10ge: myri10ge_fw_name also overrides the rss firmware 



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

Signed-off-by: default avatarBrice Goglin <brice@myri.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 7144decb

drivers/net/myri10ge/myri10ge.c

+5 −1
Original line number Diff line number Diff line
@@ -3548,7 +3548,11 @@ static void myri10ge_probe_slices(struct myri10ge_priv *mgp) 


	/* 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;