---

yaml
---
r: 10303
b: refs/heads/master
c: dbc2309
h: refs/heads/master
i:
  10301: 5c06f7c
  10299: a008f63
  10295: afba1af
  10287: 03bc5b1
  10271: d3b5912
  10239: 12a7403
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53232803241ae0f26b39897a4d4b37775837de00
+refs/heads/master: dbc2309d90b59fbb2676dc2e39150aa095e8c222

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;