Skip to contentSkip to conversation

pollcontroller patch for 2.6.0-test10-bk25-netdrvr-exp1

PATCH In review Prasanna S Panchamukhi 2 participants 2 messages Dec 3, 2003 – Dec 5, 2003

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Prasanna S Panchamukhi

author
#0 lore raw

PATCH 2/4 pollcontroller patch for 2.6.0-test10-bk25-netdrvr-exp1

Hi Jeff,

Below is the pollcontroller patch for e1000.
This patch can be applied over 2.6.0-test9-bk25-netdrvr-exp1.patch

drivers/net/e1000/e1000_main.c +12 -0
diff -urNp linux-netdrvr/drivers/net/e1000/e1000_main.c linux-2.6.0-test10/drivers/net/e1000/e1000_main.c
@@ -338,6 +338,15 @@ e1000_reset(struct e1000_adapter *adapte
 	e1000_phy_get_info(&adapter->hw, &adapter->phy_info);
 }
 
+#ifdef CONFIG_NET_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
+
 /**
  * e1000_probe - Device Initialization Routine
  * @pdev: PCI device information struct

@@ -439,6 +448,9 @@ e1000_probe(struct pci_dev *pdev,
 
 	adapter->bd_number = cards_found;
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+	netdev->poll_controller = &e1000_poll;
+#endif
 	/* setup the private structure */
 
 	if((err = e1000_sw_init(adapter)))
Signature · 5 lines
Thanks & Regards
Prasanna S Panchamukhi
Linux Technology Center
India Software Labs, IBM Bangalore
Ph: 91-80-5044632
#1 lore raw

I'm applying smc-ultra and tlan patches, but holding off on e100 and e1000.

For both, as Scott mentioned, they don't look tested under NAPI. For e100 specifically, there is a spiffy new e100 that would need to be re-diffed and tested against.

Jeff