# HG changeset patch # User Florian Pose # Date 1168614080 0 # Node ID 4c8edc04fe2458ce81edb9aa5291fbbedf15bba5 # Parent dfaeae243866b85d9e4b61f4cabef11742bab2e7 Made network driver ISRs static again. diff -r dfaeae243866 -r 4c8edc04fe24 devices/8139too-2.6.13-ethercat.c --- a/devices/8139too-2.6.13-ethercat.c Fri Jan 12 14:49:27 2007 +0000 +++ b/devices/8139too-2.6.13-ethercat.c Fri Jan 12 15:01:20 2007 +0000 @@ -693,6 +693,8 @@ MODULE_PARM_DESC(ec_device_master_index, "Index of the EtherCAT master to register the device."); +void ec_poll(struct net_device *); + /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/ static int read_eeprom (void __iomem *ioaddr, int location, int addr_len); @@ -709,11 +711,8 @@ #ifdef CONFIG_NET_POLL_CONTROLLER static void rtl8139_poll_controller(struct net_device *dev); #endif -/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/ -void ec_poll(struct net_device *); -/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/ -irqreturn_t rtl8139_interrupt (int irq, void *dev_instance, - struct pt_regs *regs); +static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance, + struct pt_regs *regs); static int rtl8139_close (struct net_device *dev); static int netdev_ioctl (struct net_device *dev, struct ifreq *rq, int cmd); static struct net_device_stats *rtl8139_get_stats (struct net_device *dev); diff -r dfaeae243866 -r 4c8edc04fe24 devices/8139too-2.6.17-ethercat.c --- a/devices/8139too-2.6.17-ethercat.c Fri Jan 12 14:49:27 2007 +0000 +++ b/devices/8139too-2.6.17-ethercat.c Fri Jan 12 15:01:20 2007 +0000 @@ -695,6 +695,8 @@ MODULE_PARM_DESC(ec_device_master_index, "Index of the EtherCAT master to register the device."); +void ec_poll(struct net_device *); + /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/ static int read_eeprom (void __iomem *ioaddr, int location, int addr_len); @@ -711,11 +713,8 @@ #ifdef CONFIG_NET_POLL_CONTROLLER static void rtl8139_poll_controller(struct net_device *dev); #endif -/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/ -void ec_poll(struct net_device *); -/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/ -irqreturn_t rtl8139_interrupt (int irq, void *dev_instance, - struct pt_regs *regs); +static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance, + struct pt_regs *regs); static int rtl8139_close (struct net_device *dev); static int netdev_ioctl (struct net_device *dev, struct ifreq *rq, int cmd); static struct net_device_stats *rtl8139_get_stats (struct net_device *dev); diff -r dfaeae243866 -r 4c8edc04fe24 devices/8139too-2.6.18-ethercat.c --- a/devices/8139too-2.6.18-ethercat.c Fri Jan 12 14:49:27 2007 +0000 +++ b/devices/8139too-2.6.18-ethercat.c Fri Jan 12 15:01:20 2007 +0000 @@ -694,6 +694,8 @@ MODULE_PARM_DESC(ec_device_master_index, "Index of the EtherCAT master to register the device."); +void ec_poll(struct net_device *); + /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/ static int read_eeprom (void __iomem *ioaddr, int location, int addr_len); @@ -710,11 +712,8 @@ #ifdef CONFIG_NET_POLL_CONTROLLER static void rtl8139_poll_controller(struct net_device *dev); #endif -/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/ -void ec_poll(struct net_device *); -/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/ -irqreturn_t rtl8139_interrupt (int irq, void *dev_instance, - struct pt_regs *regs); +static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance, + struct pt_regs *regs); static int rtl8139_close (struct net_device *dev); static int netdev_ioctl (struct net_device *dev, struct ifreq *rq, int cmd); static struct net_device_stats *rtl8139_get_stats (struct net_device *dev); diff -r dfaeae243866 -r 4c8edc04fe24 devices/8139too-2.6.19-ethercat.c --- a/devices/8139too-2.6.19-ethercat.c Fri Jan 12 14:49:27 2007 +0000 +++ b/devices/8139too-2.6.19-ethercat.c Fri Jan 12 15:01:20 2007 +0000 @@ -694,6 +694,8 @@ MODULE_PARM_DESC(ec_device_master_index, "Index of the EtherCAT master to register the device."); +void ec_poll(struct net_device *); + /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/ static int read_eeprom (void __iomem *ioaddr, int location, int addr_len); @@ -710,9 +712,6 @@ #ifdef CONFIG_NET_POLL_CONTROLLER static void rtl8139_poll_controller(struct net_device *dev); #endif -/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/ -void ec_poll(struct net_device *); -/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/ static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance); static int rtl8139_close (struct net_device *dev); static int netdev_ioctl (struct net_device *dev, struct ifreq *rq, int cmd);