# HG changeset patch # User Florian Pose # Date 1224687502 0 # Node ID 428bf6d7c9055d857f6b27b8baf583a8b9772e5d # Parent dd8e55d97280f2b0dff6006bd7733e5008c87aed Removed fix setting of device name to 'ec0'. diff -r dd8e55d97280 -r 428bf6d7c905 devices/e100-2.6.20-ethercat.c --- a/devices/e100-2.6.20-ethercat.c Wed Oct 22 12:04:07 2008 +0000 +++ b/devices/e100-2.6.20-ethercat.c Wed Oct 22 14:58:22 2008 +0000 @@ -2811,7 +2811,6 @@ // offer device to EtherCAT master module nic->ecdev = ecdev_offer(netdev, e100_ec_poll, THIS_MODULE); if (nic->ecdev) { - strcpy(netdev->name, "ec0"); if (ecdev_open(nic->ecdev)) { ecdev_withdraw(nic->ecdev); goto err_out_free; diff -r dd8e55d97280 -r 428bf6d7c905 devices/e100-2.6.24-ethercat.c --- a/devices/e100-2.6.24-ethercat.c Wed Oct 22 12:04:07 2008 +0000 +++ b/devices/e100-2.6.24-ethercat.c Wed Oct 22 14:58:22 2008 +0000 @@ -2824,7 +2824,6 @@ // offer device to EtherCAT master module nic->ecdev = ecdev_offer(netdev, e100_ec_poll, THIS_MODULE); if (nic->ecdev) { - strcpy(netdev->name, "ec0"); if (ecdev_open(nic->ecdev)) { ecdev_withdraw(nic->ecdev); goto err_out_free; diff -r dd8e55d97280 -r 428bf6d7c905 devices/e100-2.6.26-ethercat.c --- a/devices/e100-2.6.26-ethercat.c Wed Oct 22 12:04:07 2008 +0000 +++ b/devices/e100-2.6.26-ethercat.c Wed Oct 22 14:58:22 2008 +0000 @@ -2895,7 +2895,6 @@ // offer device to EtherCAT master module nic->ecdev = ecdev_offer(netdev, e100_ec_poll, THIS_MODULE); if (nic->ecdev) { - strcpy(netdev->name, "ec0"); if (ecdev_open(nic->ecdev)) { ecdev_withdraw(nic->ecdev); goto err_out_free;