diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-17 03:05:02 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-17 03:05:02 -0500 |
| commit | a2bfbc072e279ff81e6b336acff612b9bc2e5281 (patch) | |
| tree | 89cfe21911e1539e1b7f89d8a10d42abecba2a18 /drivers/net/forcedeth.c | |
| parent | 5c427ff9e4cc61625d48172ea082ae99e21eea6a (diff) | |
| parent | 82b3cc1a2f5e46300a9dec4a8cc8106dc20a4c23 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/can/Kconfig
Diffstat (limited to 'drivers/net/forcedeth.c')
| -rw-r--r-- | drivers/net/forcedeth.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 0a1c2bb27d4d..73fe97777201 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
| @@ -5820,10 +5820,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
| 5820 | dev->dev_addr); | 5820 | dev->dev_addr); |
| 5821 | dev_printk(KERN_ERR, &pci_dev->dev, | 5821 | dev_printk(KERN_ERR, &pci_dev->dev, |
| 5822 | "Please complain to your hardware vendor. Switching to a random MAC.\n"); | 5822 | "Please complain to your hardware vendor. Switching to a random MAC.\n"); |
| 5823 | dev->dev_addr[0] = 0x00; | 5823 | random_ether_addr(dev->dev_addr); |
| 5824 | dev->dev_addr[1] = 0x00; | ||
| 5825 | dev->dev_addr[2] = 0x6c; | ||
| 5826 | get_random_bytes(&dev->dev_addr[3], 3); | ||
| 5827 | } | 5824 | } |
| 5828 | 5825 | ||
| 5829 | dprintk(KERN_DEBUG "%s: MAC Address %pM\n", | 5826 | dprintk(KERN_DEBUG "%s: MAC Address %pM\n", |