aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/netdevice.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r--include/linux/netdevice.h17
1 files changed, 12 insertions, 5 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index aae6c6d153f2..28aa8e77cee9 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -952,12 +952,19 @@ DECLARE_PER_CPU(struct softnet_data,softnet_data);
952 952
953#define HAVE_NETIF_QUEUE 953#define HAVE_NETIF_QUEUE
954 954
955extern void __netif_schedule(struct net_device *dev); 955extern void __netif_schedule(struct netdev_queue *txq);
956 956
957static inline void netif_schedule(struct net_device *dev) 957static inline void netif_schedule_queue(struct netdev_queue *txq)
958{ 958{
959 struct net_device *dev = txq->dev;
960
959 if (!test_bit(__LINK_STATE_XOFF, &dev->state)) 961 if (!test_bit(__LINK_STATE_XOFF, &dev->state))
960 __netif_schedule(dev); 962 __netif_schedule(txq);
963}
964
965static inline void netif_schedule(struct net_device *dev)
966{
967 netif_schedule_queue(&dev->tx_queue);
961} 968}
962 969
963/** 970/**
@@ -987,7 +994,7 @@ static inline void netif_wake_queue(struct net_device *dev)
987 } 994 }
988#endif 995#endif
989 if (test_and_clear_bit(__LINK_STATE_XOFF, &dev->state)) 996 if (test_and_clear_bit(__LINK_STATE_XOFF, &dev->state))
990 __netif_schedule(dev); 997 __netif_schedule(&dev->tx_queue);
991} 998}
992 999
993/** 1000/**
@@ -1103,7 +1110,7 @@ static inline void netif_wake_subqueue(struct net_device *dev, u16 queue_index)
1103#endif 1110#endif
1104 if (test_and_clear_bit(__LINK_STATE_XOFF, 1111 if (test_and_clear_bit(__LINK_STATE_XOFF,
1105 &dev->egress_subqueue[queue_index].state)) 1112 &dev->egress_subqueue[queue_index].state))
1106 __netif_schedule(dev); 1113 __netif_schedule(&dev->tx_queue);
1107#endif 1114#endif
1108} 1115}
1109 1116