aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/netdevice.h
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2008-07-22 17:09:06 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-22 17:09:06 -0400
commitd29f749e252bcdbfe7a75a58f0ee92da16f127c0 (patch)
tree701734c2beed075d603d28cc4a343ecf1d4e475b /include/linux/netdevice.h
parentb32d13102d39ed411d152a7ffcc5f66d5b3b1b49 (diff)
net: Fix build failure with 'make mandocs'.
The function header comments have to go with the functions they are documenting, or things go horribly wrong when we try to process them with the docbook tools. Warning(include/linux/netdevice.h:1006): No description found for parameter 'dev_queue' Warning(include/linux/netdevice.h:1033): No description found for parameter 'dev_queue' Warning(include/linux/netdevice.h:1067): No description found for parameter 'dev_queue' Warning(include/linux/netdevice.h:1093): No description found for parameter 'dev_queue' Warning(include/linux/netdevice.h:1474): No description found for parameter 'txq' Error(net/core/dev.c:1674): cannot understand prototype: 'u32 simple_tx_hashrnd; ' Signed-off-by: Dave Jones <davej@redhat.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r--include/linux/netdevice.h58
1 files changed, 29 insertions, 29 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index f5ea445f89f0..b4d056ceab96 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -996,17 +996,17 @@ static inline void netif_tx_schedule_all(struct net_device *dev)
996 netif_schedule_queue(netdev_get_tx_queue(dev, i)); 996 netif_schedule_queue(netdev_get_tx_queue(dev, i));
997} 997}
998 998
999static inline void netif_tx_start_queue(struct netdev_queue *dev_queue)
1000{
1001 clear_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
1002}
1003
999/** 1004/**
1000 * netif_start_queue - allow transmit 1005 * netif_start_queue - allow transmit
1001 * @dev: network device 1006 * @dev: network device
1002 * 1007 *
1003 * Allow upper layers to call the device hard_start_xmit routine. 1008 * Allow upper layers to call the device hard_start_xmit routine.
1004 */ 1009 */
1005static inline void netif_tx_start_queue(struct netdev_queue *dev_queue)
1006{
1007 clear_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
1008}
1009
1010static inline void netif_start_queue(struct net_device *dev) 1010static inline void netif_start_queue(struct net_device *dev)
1011{ 1011{
1012 netif_tx_start_queue(netdev_get_tx_queue(dev, 0)); 1012 netif_tx_start_queue(netdev_get_tx_queue(dev, 0));
@@ -1022,13 +1022,6 @@ static inline void netif_tx_start_all_queues(struct net_device *dev)
1022 } 1022 }
1023} 1023}
1024 1024
1025/**
1026 * netif_wake_queue - restart transmit
1027 * @dev: network device
1028 *
1029 * Allow upper layers to call the device hard_start_xmit routine.
1030 * Used for flow control when transmit resources are available.
1031 */
1032static inline void netif_tx_wake_queue(struct netdev_queue *dev_queue) 1025static inline void netif_tx_wake_queue(struct netdev_queue *dev_queue)
1033{ 1026{
1034#ifdef CONFIG_NETPOLL_TRAP 1027#ifdef CONFIG_NETPOLL_TRAP
@@ -1041,6 +1034,13 @@ static inline void netif_tx_wake_queue(struct netdev_queue *dev_queue)
1041 __netif_schedule(dev_queue->qdisc); 1034 __netif_schedule(dev_queue->qdisc);
1042} 1035}
1043 1036
1037/**
1038 * netif_wake_queue - restart transmit
1039 * @dev: network device
1040 *
1041 * Allow upper layers to call the device hard_start_xmit routine.
1042 * Used for flow control when transmit resources are available.
1043 */
1044static inline void netif_wake_queue(struct net_device *dev) 1044static inline void netif_wake_queue(struct net_device *dev)
1045{ 1045{
1046 netif_tx_wake_queue(netdev_get_tx_queue(dev, 0)); 1046 netif_tx_wake_queue(netdev_get_tx_queue(dev, 0));
@@ -1056,6 +1056,11 @@ static inline void netif_tx_wake_all_queues(struct net_device *dev)
1056 } 1056 }
1057} 1057}
1058 1058
1059static inline void netif_tx_stop_queue(struct netdev_queue *dev_queue)
1060{
1061 set_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
1062}
1063
1059/** 1064/**
1060 * netif_stop_queue - stop transmitted packets 1065 * netif_stop_queue - stop transmitted packets
1061 * @dev: network device 1066 * @dev: network device
@@ -1063,11 +1068,6 @@ static inline void netif_tx_wake_all_queues(struct net_device *dev)
1063 * Stop upper layers calling the device hard_start_xmit routine. 1068 * Stop upper layers calling the device hard_start_xmit routine.
1064 * Used for flow control when transmit resources are unavailable. 1069 * Used for flow control when transmit resources are unavailable.
1065 */ 1070 */
1066static inline void netif_tx_stop_queue(struct netdev_queue *dev_queue)
1067{
1068 set_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
1069}
1070
1071static inline void netif_stop_queue(struct net_device *dev) 1071static inline void netif_stop_queue(struct net_device *dev)
1072{ 1072{
1073 netif_tx_stop_queue(netdev_get_tx_queue(dev, 0)); 1073 netif_tx_stop_queue(netdev_get_tx_queue(dev, 0));
@@ -1083,17 +1083,17 @@ static inline void netif_tx_stop_all_queues(struct net_device *dev)
1083 } 1083 }
1084} 1084}
1085 1085
1086static inline int netif_tx_queue_stopped(const struct netdev_queue *dev_queue)
1087{
1088 return test_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
1089}
1090
1086/** 1091/**
1087 * netif_queue_stopped - test if transmit queue is flowblocked 1092 * netif_queue_stopped - test if transmit queue is flowblocked
1088 * @dev: network device 1093 * @dev: network device
1089 * 1094 *
1090 * Test if transmit queue on device is currently unable to send. 1095 * Test if transmit queue on device is currently unable to send.
1091 */ 1096 */
1092static inline int netif_tx_queue_stopped(const struct netdev_queue *dev_queue)
1093{
1094 return test_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
1095}
1096
1097static inline int netif_queue_stopped(const struct net_device *dev) 1097static inline int netif_queue_stopped(const struct net_device *dev)
1098{ 1098{
1099 return netif_tx_queue_stopped(netdev_get_tx_queue(dev, 0)); 1099 return netif_tx_queue_stopped(netdev_get_tx_queue(dev, 0));
@@ -1463,13 +1463,6 @@ static inline void netif_rx_complete(struct net_device *dev,
1463 local_irq_restore(flags); 1463 local_irq_restore(flags);
1464} 1464}
1465 1465
1466/**
1467 * netif_tx_lock - grab network device transmit lock
1468 * @dev: network device
1469 * @cpu: cpu number of lock owner
1470 *
1471 * Get network device transmit lock
1472 */
1473static inline void __netif_tx_lock(struct netdev_queue *txq, int cpu) 1466static inline void __netif_tx_lock(struct netdev_queue *txq, int cpu)
1474{ 1467{
1475 spin_lock(&txq->_xmit_lock); 1468 spin_lock(&txq->_xmit_lock);
@@ -1482,6 +1475,13 @@ static inline void __netif_tx_lock_bh(struct netdev_queue *txq)
1482 txq->xmit_lock_owner = smp_processor_id(); 1475 txq->xmit_lock_owner = smp_processor_id();
1483} 1476}
1484 1477
1478/**
1479 * netif_tx_lock - grab network device transmit lock
1480 * @dev: network device
1481 * @cpu: cpu number of lock owner
1482 *
1483 * Get network device transmit lock
1484 */
1485static inline void netif_tx_lock(struct net_device *dev) 1485static inline void netif_tx_lock(struct net_device *dev)
1486{ 1486{
1487 int cpu = smp_processor_id(); 1487 int cpu = smp_processor_id();