diff -purN -X /home/mbligh/.diff.exclude 100-kgdb/drivers/net/eepro100.c 101-poll_eepro100/drivers/net/eepro100.c --- 100-kgdb/drivers/net/eepro100.c 2003-10-01 11:46:38.000000000 -0700 +++ 101-poll_eepro100/drivers/net/eepro100.c 2003-12-11 17:01:43.000000000 -0800 @@ -543,6 +543,9 @@ static void speedo_refill_rx_buffers(str static int speedo_rx(struct net_device *dev); static void speedo_tx_buffer_gc(struct net_device *dev); static irqreturn_t speedo_interrupt(int irq, void *dev_instance, struct pt_regs *regs); +#ifdef CONFIG_NET_POLL_CONTROLLER +static void poll_speedo (struct net_device *dev); +#endif static int speedo_close(struct net_device *dev); static struct net_device_stats *speedo_get_stats(struct net_device *dev); static int speedo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); @@ -885,6 +888,9 @@ static int __devinit speedo_found1(struc dev->get_stats = &speedo_get_stats; dev->set_multicast_list = &set_rx_mode; dev->do_ioctl = &speedo_ioctl; +#ifdef CONFIG_NET_POLL_CONTROLLER + dev->poll_controller = &poll_speedo; +#endif if (register_netdevice(dev)) goto err_free_unlock; @@ -1675,6 +1681,22 @@ static irqreturn_t speedo_interrupt(int return IRQ_RETVAL(handled); } +#ifdef CONFIG_NET_POLL_CONTROLLER + +/* + * Polling 'interrupt' - used by things like netconsole to send skbs + * without having to re-enable interrupts. It's not called while + * the interrupt routine is executing. + */ + +static void poll_speedo (struct net_device *dev) +{ + disable_irq(dev->irq); + speedo_interrupt (dev->irq, dev, NULL); + enable_irq(dev->irq); +} +#endif + static inline struct RxFD *speedo_rx_alloc(struct net_device *dev, int entry) { struct speedo_private *sp = (struct speedo_private *)dev->priv;