From 7b45f799dd6d649aa10ce8ba8376128965c36187 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Fri, 12 Jan 2007 15:01:20 +0000 Subject: [PATCH] Made network driver ISRs static again. --- devices/8139too-2.6.13-ethercat.c | 9 ++++----- devices/8139too-2.6.17-ethercat.c | 9 ++++----- devices/8139too-2.6.18-ethercat.c | 9 ++++----- devices/8139too-2.6.19-ethercat.c | 5 ++--- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/devices/8139too-2.6.13-ethercat.c b/devices/8139too-2.6.13-ethercat.c index 59a533d9..67d257a1 100644 --- a/devices/8139too-2.6.13-ethercat.c +++ b/devices/8139too-2.6.13-ethercat.c @@ -693,6 +693,8 @@ MODULE_PARM_DESC(ec_device_index, 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 @@ static int rtl8139_poll(struct net_device *dev, int *budget); #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 --git a/devices/8139too-2.6.17-ethercat.c b/devices/8139too-2.6.17-ethercat.c index 63931afb..4d3a5ba4 100644 --- a/devices/8139too-2.6.17-ethercat.c +++ b/devices/8139too-2.6.17-ethercat.c @@ -695,6 +695,8 @@ MODULE_PARM_DESC(ec_device_index, 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 @@ static int rtl8139_poll(struct net_device *dev, int *budget); #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 --git a/devices/8139too-2.6.18-ethercat.c b/devices/8139too-2.6.18-ethercat.c index bc6156d3..26798692 100644 --- a/devices/8139too-2.6.18-ethercat.c +++ b/devices/8139too-2.6.18-ethercat.c @@ -694,6 +694,8 @@ MODULE_PARM_DESC(ec_device_index, 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 @@ static int rtl8139_poll(struct net_device *dev, int *budget); #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 --git a/devices/8139too-2.6.19-ethercat.c b/devices/8139too-2.6.19-ethercat.c index 83a3497e..1f2103e1 100644 --- a/devices/8139too-2.6.19-ethercat.c +++ b/devices/8139too-2.6.19-ethercat.c @@ -694,6 +694,8 @@ MODULE_PARM_DESC(ec_device_index, 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 @@ static int rtl8139_poll(struct net_device *dev, int *budget); #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);