et131x.c (ffb1e76f4f32d2b8ea4189df0484980370476395) | et131x.c (f3956ebb3bf06ab2266ad5ee2214aed46405810c) |
---|---|
1/* Agere Systems Inc. 2 * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs 3 * 4 * Copyright © 2005 Agere Systems Inc. 5 * All rights reserved. 6 * http://www.agere.com 7 * 8 * Copyright (c) 2011 Mark Einon <mark.einon@gmail.com> --- 3849 unchanged lines hidden (view full) --- 3858 if (result != 0) { 3859 dev_warn(&adapter->pdev->dev, 3860 "Change MTU failed; couldn't re-alloc DMA memory\n"); 3861 return result; 3862 } 3863 3864 et131x_init_send(adapter); 3865 et131x_hwaddr_init(adapter); | 1/* Agere Systems Inc. 2 * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs 3 * 4 * Copyright © 2005 Agere Systems Inc. 5 * All rights reserved. 6 * http://www.agere.com 7 * 8 * Copyright (c) 2011 Mark Einon <mark.einon@gmail.com> --- 3849 unchanged lines hidden (view full) --- 3858 if (result != 0) { 3859 dev_warn(&adapter->pdev->dev, 3860 "Change MTU failed; couldn't re-alloc DMA memory\n"); 3861 return result; 3862 } 3863 3864 et131x_init_send(adapter); 3865 et131x_hwaddr_init(adapter); |
3866 ether_addr_copy(netdev->dev_addr, adapter->addr); | 3866 eth_hw_addr_set(netdev, adapter->addr); |
3867 3868 /* Init the device with the new settings */ 3869 et131x_adapter_setup(adapter); 3870 et131x_enable_txrx(netdev); 3871 3872 return result; 3873} 3874 --- 86 unchanged lines hidden (view full) --- 3961 dev_err(&pdev->dev, "Could not alloc adapter memory (DMA)\n"); 3962 goto err_iounmap; 3963 } 3964 3965 et131x_init_send(adapter); 3966 3967 netif_napi_add(netdev, &adapter->napi, et131x_poll, 64); 3968 | 3867 3868 /* Init the device with the new settings */ 3869 et131x_adapter_setup(adapter); 3870 et131x_enable_txrx(netdev); 3871 3872 return result; 3873} 3874 --- 86 unchanged lines hidden (view full) --- 3961 dev_err(&pdev->dev, "Could not alloc adapter memory (DMA)\n"); 3962 goto err_iounmap; 3963 } 3964 3965 et131x_init_send(adapter); 3966 3967 netif_napi_add(netdev, &adapter->napi, et131x_poll, 64); 3968 |
3969 ether_addr_copy(netdev->dev_addr, adapter->addr); | 3969 eth_hw_addr_set(netdev, adapter->addr); |
3970 3971 rc = -ENOMEM; 3972 3973 adapter->mii_bus = mdiobus_alloc(); 3974 if (!adapter->mii_bus) { 3975 dev_err(&pdev->dev, "Alloc of mii_bus struct failed\n"); 3976 goto err_mem_free; 3977 } --- 83 unchanged lines hidden --- | 3970 3971 rc = -ENOMEM; 3972 3973 adapter->mii_bus = mdiobus_alloc(); 3974 if (!adapter->mii_bus) { 3975 dev_err(&pdev->dev, "Alloc of mii_bus struct failed\n"); 3976 goto err_mem_free; 3977 } --- 83 unchanged lines hidden --- |