aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-05-08 18:11:26 -0400
committerStephen Hemminger <shemminger@osdl.org>2006-05-08 19:00:23 -0400
commitd324031245abbb54e4e0321004430826052b6c37 (patch)
tree23dda7055fce9675263fe992c3beda27f1161650 /include
parent6810b548b25114607e0814612d84125abccc0a4f (diff)
sky2: backout NAPI reschedule
This is a backout of earlier patch. The whole rescheduling hack was a bad idea. It doesn't really solve the problem and it makes the code more complicated for no good reason. Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/netdevice.h18
1 files changed, 8 insertions, 10 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 309f9190a922..a461b51d6076 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -831,21 +831,19 @@ static inline void netif_rx_schedule(struct net_device *dev)
831 __netif_rx_schedule(dev); 831 __netif_rx_schedule(dev);
832} 832}
833 833
834 834/* Try to reschedule poll. Called by dev->poll() after netif_rx_complete().
835static inline void __netif_rx_reschedule(struct net_device *dev, int undo) 835 * Do not inline this?
836{ 836 */
837 dev->quota += undo;
838 list_add_tail(&dev->poll_list, &__get_cpu_var(softnet_data).poll_list);
839 __raise_softirq_irqoff(NET_RX_SOFTIRQ);
840}
841
842/* Try to reschedule poll. Called by dev->poll() after netif_rx_complete(). */
843static inline int netif_rx_reschedule(struct net_device *dev, int undo) 837static inline int netif_rx_reschedule(struct net_device *dev, int undo)
844{ 838{
845 if (netif_rx_schedule_prep(dev)) { 839 if (netif_rx_schedule_prep(dev)) {
846 unsigned long flags; 840 unsigned long flags;
841
842 dev->quota += undo;
843
847 local_irq_save(flags); 844 local_irq_save(flags);
848 __netif_rx_reschedule(dev, undo); 845 list_add_tail(&dev->poll_list, &__get_cpu_var(softnet_data).poll_list);
846 __raise_softirq_irqoff(NET_RX_SOFTIRQ);
849 local_irq_restore(flags); 847 local_irq_restore(flags);
850 return 1; 848 return 1;
851 } 849 }