diff options
Diffstat (limited to 'drivers/net/wan/pc300_drv.c')
-rw-r--r-- | drivers/net/wan/pc300_drv.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c index 3f744c643094..c6aa66e5b52f 100644 --- a/drivers/net/wan/pc300_drv.c +++ b/drivers/net/wan/pc300_drv.c | |||
@@ -396,7 +396,7 @@ static void tx1_dma_buf_check(pc300_t * card, int ch) | |||
396 | u16 next_bd = card->chan[ch].tx_next_bd; | 396 | u16 next_bd = card->chan[ch].tx_next_bd; |
397 | u32 scabase = card->hw.scabase; | 397 | u32 scabase = card->hw.scabase; |
398 | 398 | ||
399 | printk ("\nnfree_tx_bd = %d \n", card->chan[ch].nfree_tx_bd); | 399 | printk ("\nnfree_tx_bd = %d\n", card->chan[ch].nfree_tx_bd); |
400 | printk("#CH%d: f_bd = %d(0x%08x), n_bd = %d(0x%08x)\n", ch, | 400 | printk("#CH%d: f_bd = %d(0x%08x), n_bd = %d(0x%08x)\n", ch, |
401 | first_bd, TX_BD_ADDR(ch, first_bd), | 401 | first_bd, TX_BD_ADDR(ch, first_bd), |
402 | next_bd, TX_BD_ADDR(ch, next_bd)); | 402 | next_bd, TX_BD_ADDR(ch, next_bd)); |
@@ -1790,7 +1790,7 @@ static void cpc_tx_timeout(struct net_device *dev) | |||
1790 | cpc_readb(card->hw.falcbase + card->hw.cpld_reg2) & | 1790 | cpc_readb(card->hw.falcbase + card->hw.cpld_reg2) & |
1791 | ~(CPLD_REG2_FALC_LED1 << (2 * ch))); | 1791 | ~(CPLD_REG2_FALC_LED1 << (2 * ch))); |
1792 | } | 1792 | } |
1793 | dev->trans_start = jiffies; | 1793 | dev->trans_start = jiffies; /* prevent tx timeout */ |
1794 | CPC_UNLOCK(card, flags); | 1794 | CPC_UNLOCK(card, flags); |
1795 | netif_wake_queue(dev); | 1795 | netif_wake_queue(dev); |
1796 | } | 1796 | } |
@@ -1849,7 +1849,6 @@ static int cpc_queue_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1849 | if (d->trace_on) { | 1849 | if (d->trace_on) { |
1850 | cpc_trace(dev, skb, 'T'); | 1850 | cpc_trace(dev, skb, 'T'); |
1851 | } | 1851 | } |
1852 | dev->trans_start = jiffies; | ||
1853 | 1852 | ||
1854 | /* Start transmission */ | 1853 | /* Start transmission */ |
1855 | CPC_LOCK(card, flags); | 1854 | CPC_LOCK(card, flags); |