aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wan
diff options
context:
space:
mode:
authorKrzysztof Hałasa <khc@pm.waw.pl>2009-05-25 07:25:34 -0400
committerKrzysztof Hałasa <khc@pm.waw.pl>2009-05-25 07:25:34 -0400
commit9733bb8e9ce0078f55405ce470a62ec0a551fe99 (patch)
treea8db59b6a76c678db1d1282ba7458d72f4f8a093 /drivers/net/wan
parent11c79740d3c03cb81f84e98cf2e2dbd8d9bb53cd (diff)
IXP4xx: Change QMgr function names to qmgr_stat_*_watermark and clean the comments.
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
Diffstat (limited to 'drivers/net/wan')
-rw-r--r--drivers/net/wan/ixp4xx_hss.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c
index 1e56e58c660..a6dc317083d 100644
--- a/drivers/net/wan/ixp4xx_hss.c
+++ b/drivers/net/wan/ixp4xx_hss.c
@@ -790,11 +790,10 @@ static void hss_hdlc_txdone_irq(void *pdev)
790 free_buffer_irq(port->tx_buff_tab[n_desc]); 790 free_buffer_irq(port->tx_buff_tab[n_desc]);
791 port->tx_buff_tab[n_desc] = NULL; 791 port->tx_buff_tab[n_desc] = NULL;
792 792
793 /* really empty in fact */ 793 start = qmgr_stat_below_low_watermark(port->plat->txreadyq);
794 start = qmgr_stat_nearly_empty(port->plat->txreadyq);
795 queue_put_desc(port->plat->txreadyq, 794 queue_put_desc(port->plat->txreadyq,
796 tx_desc_phys(port, n_desc), desc); 795 tx_desc_phys(port, n_desc), desc);
797 if (start) { 796 if (start) { /* TX-ready queue was empty */
798#if DEBUG_TX 797#if DEBUG_TX
799 printk(KERN_DEBUG "%s: hss_hdlc_txdone_irq xmit" 798 printk(KERN_DEBUG "%s: hss_hdlc_txdone_irq xmit"
800 " ready\n", dev->name); 799 " ready\n", dev->name);
@@ -869,13 +868,13 @@ static int hss_hdlc_xmit(struct sk_buff *skb, struct net_device *dev)
869 queue_put_desc(queue_ids[port->id].tx, tx_desc_phys(port, n), desc); 868 queue_put_desc(queue_ids[port->id].tx, tx_desc_phys(port, n), desc);
870 dev->trans_start = jiffies; 869 dev->trans_start = jiffies;
871 870
872 if (qmgr_stat_nearly_empty(txreadyq)) { /* really empty in fact */ 871 if (qmgr_stat_below_low_watermark(txreadyq)) { /* empty */
873#if DEBUG_TX 872#if DEBUG_TX
874 printk(KERN_DEBUG "%s: hss_hdlc_xmit queue full\n", dev->name); 873 printk(KERN_DEBUG "%s: hss_hdlc_xmit queue full\n", dev->name);
875#endif 874#endif
876 netif_stop_queue(dev); 875 netif_stop_queue(dev);
877 /* we could miss TX ready interrupt */ 876 /* we could miss TX ready interrupt */
878 if (!qmgr_stat_nearly_empty(txreadyq)) { 877 if (!qmgr_stat_below_low_watermark(txreadyq)) {
879#if DEBUG_TX 878#if DEBUG_TX
880 printk(KERN_DEBUG "%s: hss_hdlc_xmit ready again\n", 879 printk(KERN_DEBUG "%s: hss_hdlc_xmit ready again\n",
881 dev->name); 880 dev->name);