scc.c (ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672) | scc.c (b03efcfb2180289718991bb984044ce6c5b7d1b0) |
---|---|
1#define RCS_ID "$Id: scc.c,v 1.75 1998/11/04 15:15:01 jreuter Exp jreuter $" 2 3#define VERSION "3.0" 4 5/* 6 * Please use z8530drv-utils-3.0 with this version. 7 * ------------------ 8 * --- 290 unchanged lines hidden (view full) --- 299 300 spin_lock_irqsave(&scc->lock, flags); 301 if (scc->tx_buff != NULL) 302 { 303 dev_kfree_skb(scc->tx_buff); 304 scc->tx_buff = NULL; 305 } 306 | 1#define RCS_ID "$Id: scc.c,v 1.75 1998/11/04 15:15:01 jreuter Exp jreuter $" 2 3#define VERSION "3.0" 4 5/* 6 * Please use z8530drv-utils-3.0 with this version. 7 * ------------------ 8 * --- 290 unchanged lines hidden (view full) --- 299 300 spin_lock_irqsave(&scc->lock, flags); 301 if (scc->tx_buff != NULL) 302 { 303 dev_kfree_skb(scc->tx_buff); 304 scc->tx_buff = NULL; 305 } 306 |
307 while (skb_queue_len(&scc->tx_queue)) | 307 while (!skb_queue_empty(&scc->tx_queue)) |
308 dev_kfree_skb(skb_dequeue(&scc->tx_queue)); 309 310 spin_unlock_irqrestore(&scc->lock, flags); 311} 312 313 314 315/* ******************************************************************** */ --- 805 unchanged lines hidden (view full) --- 1121 */ 1122 1123static void t_dwait(unsigned long channel) 1124{ 1125 struct scc_channel *scc = (struct scc_channel *) channel; 1126 1127 if (scc->stat.tx_state == TXS_WAIT) /* maxkeyup or idle timeout */ 1128 { | 308 dev_kfree_skb(skb_dequeue(&scc->tx_queue)); 309 310 spin_unlock_irqrestore(&scc->lock, flags); 311} 312 313 314 315/* ******************************************************************** */ --- 805 unchanged lines hidden (view full) --- 1121 */ 1122 1123static void t_dwait(unsigned long channel) 1124{ 1125 struct scc_channel *scc = (struct scc_channel *) channel; 1126 1127 if (scc->stat.tx_state == TXS_WAIT) /* maxkeyup or idle timeout */ 1128 { |
1129 if (skb_queue_len(&scc->tx_queue) == 0) /* nothing to send */ 1130 { | 1129 if (skb_queue_empty(&scc->tx_queue)) { /* nothing to send */ |
1131 scc->stat.tx_state = TXS_IDLE; 1132 netif_wake_queue(scc->dev); /* t_maxkeyup locked it. */ 1133 return; 1134 } 1135 1136 scc->stat.tx_state = TXS_BUSY; 1137 } 1138 --- 1050 unchanged lines hidden --- | 1130 scc->stat.tx_state = TXS_IDLE; 1131 netif_wake_queue(scc->dev); /* t_maxkeyup locked it. */ 1132 return; 1133 } 1134 1135 scc->stat.tx_state = TXS_BUSY; 1136 } 1137 --- 1050 unchanged lines hidden --- |