Skip to contentSkip to conversation

myri10ge: myri10ge_fw_name also overrides the rss firmware

PATCH Applied Brice Goglin 2 participants 2 messages Aug 13, 2008 – Aug 14, 2008

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Brice Goglin

author
#0 lore raw

PATCH 1/1 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 Brice Goglin <[email protected]>
---
 drivers/net/myri10ge/myri10ge.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/myri10ge/myri10ge.c +5 -1
Index: linux-2.6/drivers/net/myri10ge/myri10ge.c
===================================================================
@@ -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
#1 lore raw
Quoted 18 lines · Brice Goglin

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

Signed-off-by Brice Goglin <[email protected]>
---
 drivers/net/myri10ge/myri10ge.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Index: linux-2.6/drivers/net/myri10ge/myri10ge.c
===================================================================

drivers/net/myri10ge/myri10ge.c +1 -1
@@ -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) {

drivers/net/myri10ge/myri10ge.c

Quoted 10 lines
drivers/net/myri10ge/myri10ge.c +4 -1
+		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