← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-lowlatency/precise-proposed

« back to all changes in this revision

Viewing changes to drivers/net/ethernet/3com/3c59x.c

  • Committer: Package Import Robot
  • Author(s): Luke Yelavich, Luke Yelavich, Upstream Kernel Changes
  • Date: 2012-04-04 18:49:36 UTC
  • Revision ID: package-import@ubuntu.com-20120404184936-tqu735914muv4wpg
Tags: 3.2.0-22.30
[ Luke Yelavich ]

* [Config] Update configs after rebase against Ubuntu-3.2.0-22.35

[ Upstream Kernel Changes ]

* Low-latency: Rebase against Ubuntu-3.2.0-22.35

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/ethernet/3com/3c59x.c
2929
2929
{
2930
2930
        struct vortex_private *vp = netdev_priv(dev);
2931
2931
 
2932
 
        strcpy(info->driver, DRV_NAME);
 
2932
        strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
2933
2933
        if (VORTEX_PCI(vp)) {
2934
 
                strcpy(info->bus_info, pci_name(VORTEX_PCI(vp)));
 
2934
                strlcpy(info->bus_info, pci_name(VORTEX_PCI(vp)),
 
2935
                        sizeof(info->bus_info));
2935
2936
        } else {
2936
2937
                if (VORTEX_EISA(vp))
2937
 
                        strcpy(info->bus_info, dev_name(vp->gendev));
 
2938
                        strlcpy(info->bus_info, dev_name(vp->gendev),
 
2939
                                sizeof(info->bus_info));
2938
2940
                else
2939
 
                        sprintf(info->bus_info, "EISA 0x%lx %d",
2940
 
                                        dev->base_addr, dev->irq);
 
2941
                        snprintf(info->bus_info, sizeof(info->bus_info),
 
2942
                                "EISA 0x%lx %d", dev->base_addr, dev->irq);
2941
2943
        }
2942
2944
}
2943
2945