From: Haren M. <hb...@us...> - 2004-01-05 04:00:45
|
Hello, For netdump based dumping, this small change is needed to compile successfully if e1000 card is configured. Thanks Haren --- /home/hbabu/test/linux-2.6.0-test9/drivers/net/e1000/e1000_main.c 2003-10-25 11:43:24.000000000 -0700 +++ /home/hbabu/linux-2.6.0-test9/drivers/net/e1000/e1000_main.c 2003-12-25 19:04:18.000000000 -0800 @@ -165,6 +165,9 @@ static void e1000_leave_82542_rst(struct static inline void e1000_rx_checksum(struct e1000_adapter *adapter, struct e1000_rx_desc *rx_desc, struct sk_buff *skb); +#ifdef HAVE_POLL_CONTROLLER +static void e1000_Poll(struct net_device *dev); +#endif static void e1000_tx_timeout(struct net_device *dev); static void e1000_tx_timeout_task(struct net_device *dev); static void e1000_smartspeed(struct e1000_adapter *adapter); @@ -442,6 +445,9 @@ e1000_probe(struct pci_dev *pdev, adapter->bd_number = cards_found; +#ifdef HAVE_POLL_CONTROLLER + netdev->poll_controller = &e1000_Poll; +#endif /* setup the private structure */ if((err = e1000_sw_init(adapter))) @@ -2127,6 +2133,15 @@ e1000_intr(int irq, void *data, struct p return IRQ_HANDLED; } +#ifdef HAVE_POLL_CONTROLLER +static void e1000_Poll(struct net_device *dev) +{ + disable_irq(dev->irq); + e1000_intr(dev->irq, dev, NULL); + enable_irq(dev->irq); +} +#endif + #ifdef CONFIG_E1000_NAPI /** * e1000_clean - NAPI Rx polling callback |