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

« back to all changes in this revision

Viewing changes to drivers/net/ethernet/dec/tulip/dmfe.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:
1085
1085
{
1086
1086
        struct dmfe_board_info *np = netdev_priv(dev);
1087
1087
 
1088
 
        strcpy(info->driver, DRV_NAME);
1089
 
        strcpy(info->version, DRV_VERSION);
 
1088
        strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
 
1089
        strlcpy(info->version, DRV_VERSION, sizeof(info->version));
1090
1090
        if (np->pdev)
1091
 
                strcpy(info->bus_info, pci_name(np->pdev));
 
1091
                strlcpy(info->bus_info, pci_name(np->pdev),
 
1092
                        sizeof(info->bus_info));
1092
1093
        else
1093
1094
                sprintf(info->bus_info, "EISA 0x%lx %d",
1094
1095
                        dev->base_addr, dev->irq);