# HG changeset patch # User Florian Pose # Date 1150125252 0 # Node ID e7d4579617afa2d11e9bb3f24cd6b3326ca6863d # Parent efb1c792a6a46eb8beede4c8bb8590b28b4b91ef Minor changes in 8139too driver. diff -r efb1c792a6a4 -r e7d4579617af devices/8139too.c --- a/devices/8139too.c Mon Jun 12 14:37:38 2006 +0000 +++ b/devices/8139too.c Mon Jun 12 15:14:12 2006 +0000 @@ -343,6 +343,7 @@ /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/ +/* prevent driver from being loaded automatically */ //MODULE_DEVICE_TABLE (pci, rtl8139_pci_tbl); /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/ @@ -670,10 +671,8 @@ /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/ -MODULE_AUTHOR("Wilhelm Hagemeister ," - " Florian Pose "); -MODULE_DESCRIPTION("RealTek RTL-8139 Fast Ethernet" - " driver with EtherCAT functionality"); +MODULE_AUTHOR("Florian Pose "); +MODULE_DESCRIPTION("RealTek RTL-8139 EtherCAT driver"); MODULE_LICENSE("GPL"); MODULE_VERSION(COMPILE_INFO); @@ -1416,12 +1415,9 @@ /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/ -#ifdef EC_DEBUG - printk(KERN_DEBUG "%s: open\n", dev->name); -#endif - if (dev != rtl_ec_net_dev) { - retval = request_irq (dev->irq, rtl8139_interrupt, SA_SHIRQ, dev->name, dev); + retval = request_irq(dev->irq, rtl8139_interrupt, + SA_SHIRQ, dev->name, dev); if (retval) return retval; } @@ -1822,12 +1818,6 @@ tp->xstats.tx_timeouts++; - /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/ - - printk(KERN_DEBUG "%s: tx_timeout\n", dev->name); - - /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/ - /* disable Tx ASAP, if not already */ tmp8 = RTL_R8 (ChipCmd); if (tmp8 & CmdTxEnb)