diff options
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 01db7b88a2b1..a461b51d6076 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -506,6 +506,8 @@ struct net_device | |||
506 | 506 | ||
507 | /* class/net/name entry */ | 507 | /* class/net/name entry */ |
508 | struct class_device class_dev; | 508 | struct class_device class_dev; |
509 | /* space for optional statistics and wireless sysfs groups */ | ||
510 | struct attribute_group *sysfs_groups[3]; | ||
509 | }; | 511 | }; |
510 | 512 | ||
511 | #define NETDEV_ALIGN 32 | 513 | #define NETDEV_ALIGN 32 |
@@ -829,21 +831,19 @@ static inline void netif_rx_schedule(struct net_device *dev) | |||
829 | __netif_rx_schedule(dev); | 831 | __netif_rx_schedule(dev); |
830 | } | 832 | } |
831 | 833 | ||
832 | 834 | /* Try to reschedule poll. Called by dev->poll() after netif_rx_complete(). | |
833 | static inline void __netif_rx_reschedule(struct net_device *dev, int undo) | 835 | * Do not inline this? |
834 | { | 836 | */ |
835 | dev->quota += undo; | ||
836 | list_add_tail(&dev->poll_list, &__get_cpu_var(softnet_data).poll_list); | ||
837 | __raise_softirq_irqoff(NET_RX_SOFTIRQ); | ||
838 | } | ||
839 | |||
840 | /* Try to reschedule poll. Called by dev->poll() after netif_rx_complete(). */ | ||
841 | static inline int netif_rx_reschedule(struct net_device *dev, int undo) | 837 | static inline int netif_rx_reschedule(struct net_device *dev, int undo) |
842 | { | 838 | { |
843 | if (netif_rx_schedule_prep(dev)) { | 839 | if (netif_rx_schedule_prep(dev)) { |
844 | unsigned long flags; | 840 | unsigned long flags; |
841 | |||
842 | dev->quota += undo; | ||
843 | |||
845 | local_irq_save(flags); | 844 | local_irq_save(flags); |
846 | __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); | ||
847 | local_irq_restore(flags); | 847 | local_irq_restore(flags); |
848 | return 1; | 848 | return 1; |
849 | } | 849 | } |