From f22120a2ddb063e4a1cc2f37250944e5ff75bb57 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 28 Sep 2005 17:50:51 -0400
Subject: [PATCH] --- yaml --- r: 10303 b: refs/heads/master c:
 dbc2309d90b59fbb2676dc2e39150aa095e8c222 h: refs/heads/master i:   10301:
 5c06f7c9a23f600c206966f78b9b9f3ec10cd7eb   10299:
 a008f6320f06c335bb2d266092aa134e1ada9376   10295:
 afba1af23b0e744a19a76c48da54ea7c3d56d9da   10287:
 03bc5b1d9cf53738aba11a64be32d2a2320b78b1   10271:
 d3b5912561eae7250cc89619de0c6d9e442e09bb   10239:
 12a740396ea23014a3b112b41ad11c8d6dfb2655 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/s2io.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 2d50a562e4ba..585d7fd793b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53232803241ae0f26b39897a4d4b37775837de00
+refs/heads/master: dbc2309d90b59fbb2676dc2e39150aa095e8c222
diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c
index 4b9f1828845e..eff747cf3113 100644
--- a/trunk/drivers/net/s2io.c
+++ b/trunk/drivers/net/s2io.c
@@ -4177,11 +4177,10 @@ static void s2io_ethtool_gdrvinfo(struct net_device *dev,
 {
 	nic_t *sp = dev->priv;
 
-	strncpy(info->driver, s2io_driver_name, sizeof(s2io_driver_name));
-	strncpy(info->version, s2io_driver_version,
-		sizeof(s2io_driver_version));
-	strncpy(info->fw_version, "", 32);
-	strncpy(info->bus_info, pci_name(sp->pdev), 32);
+	strncpy(info->driver, s2io_driver_name, sizeof(info->driver));
+	strncpy(info->version, s2io_driver_version, sizeof(info->version));
+	strncpy(info->fw_version, "", sizeof(info->fw_version));
+	strncpy(info->bus_info, pci_name(sp->pdev), sizeof(info->bus_info));
 	info->regdump_len = XENA_REG_SPACE;
 	info->eedump_len = XENA_EEPROM_SPACE;
 	info->testinfo_len = S2IO_TEST_LEN;