|
@@ -1756,15 +1756,15 @@ static void b44_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *inf
|
|
struct b44 *bp = netdev_priv(dev);
|
|
struct b44 *bp = netdev_priv(dev);
|
|
struct ssb_bus *bus = bp->sdev->bus;
|
|
struct ssb_bus *bus = bp->sdev->bus;
|
|
|
|
|
|
- strncpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver));
|
|
|
|
- strncpy(info->version, DRV_MODULE_VERSION, sizeof(info->driver));
|
|
|
|
|
|
+ strlcpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver));
|
|
|
|
+ strlcpy(info->version, DRV_MODULE_VERSION, sizeof(info->version));
|
|
switch (bus->bustype) {
|
|
switch (bus->bustype) {
|
|
case SSB_BUSTYPE_PCI:
|
|
case SSB_BUSTYPE_PCI:
|
|
- strncpy(info->bus_info, pci_name(bus->host_pci), sizeof(info->bus_info));
|
|
|
|
|
|
+ strlcpy(info->bus_info, pci_name(bus->host_pci), sizeof(info->bus_info));
|
|
break;
|
|
break;
|
|
case SSB_BUSTYPE_PCMCIA:
|
|
case SSB_BUSTYPE_PCMCIA:
|
|
case SSB_BUSTYPE_SSB:
|
|
case SSB_BUSTYPE_SSB:
|
|
- strncpy(info->bus_info, "SSB", sizeof(info->bus_info));
|
|
|
|
|
|
+ strlcpy(info->bus_info, "SSB", sizeof(info->bus_info));
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|