---

yaml --- r: 277936 b: refs/heads/master c: 6f39da2 h: refs/heads/master v: v3
git-mirror · Nov 24, 2011 · 9b4dca5 · 9b4dca5
1 parent 754f62a
commit 9b4dca5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cfa5a0471fef43fda0b7bd87e3a5e4dbadb7809
+refs/heads/master: 6f39da2c5eab64921f92a9ff4a48f3d14a8db24c
diff --git a/trunk/drivers/net/ethernet/marvell/mv643xx_eth.c b/trunk/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -1502,11 +1502,12 @@ mv643xx_eth_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 static void mv643xx_eth_get_drvinfo(struct net_device *dev,
 				    struct ethtool_drvinfo *drvinfo)
 {
-	strlcpy(drvinfo->driver, mv643xx_eth_driver_name, sizeof(info->driver));
+	strlcpy(drvinfo->driver, mv643xx_eth_driver_name,
+		sizeof(drvinfo->driver));
 	strlcpy(drvinfo->version, mv643xx_eth_driver_version,
-		sizeof(info->version));
-	strlcpy(drvinfo->fw_version, "N/A", sizeof(info->fw_version));
-	strlcpy(drvinfo->bus_info, "platform", sizeof(info->bus_info));
+		sizeof(drvinfo->version));
+	strlcpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));
+	strlcpy(drvinfo->bus_info, "platform", sizeof(drvinfo->bus_info));
 	drvinfo->n_stats = ARRAY_SIZE(mv643xx_eth_stats);
 }