diff options
Diffstat (limited to 'drivers/net/ifb.c')
| -rw-r--r-- | drivers/net/ifb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c index 31fb2d75dc44..2e222ef91e22 100644 --- a/drivers/net/ifb.c +++ b/drivers/net/ifb.c | |||
| @@ -76,13 +76,13 @@ static void ri_tasklet(unsigned long dev) | |||
| 76 | dp->st_task_enter++; | 76 | dp->st_task_enter++; |
| 77 | if ((skb = skb_peek(&dp->tq)) == NULL) { | 77 | if ((skb = skb_peek(&dp->tq)) == NULL) { |
| 78 | dp->st_txq_refl_try++; | 78 | dp->st_txq_refl_try++; |
| 79 | if (spin_trylock(&_dev->xmit_lock)) { | 79 | if (netif_tx_trylock(_dev)) { |
| 80 | dp->st_rxq_enter++; | 80 | dp->st_rxq_enter++; |
| 81 | while ((skb = skb_dequeue(&dp->rq)) != NULL) { | 81 | while ((skb = skb_dequeue(&dp->rq)) != NULL) { |
| 82 | skb_queue_tail(&dp->tq, skb); | 82 | skb_queue_tail(&dp->tq, skb); |
| 83 | dp->st_rx2tx_tran++; | 83 | dp->st_rx2tx_tran++; |
| 84 | } | 84 | } |
| 85 | spin_unlock(&_dev->xmit_lock); | 85 | netif_tx_unlock(_dev); |
| 86 | } else { | 86 | } else { |
| 87 | /* reschedule */ | 87 | /* reschedule */ |
| 88 | dp->st_rxq_notenter++; | 88 | dp->st_rxq_notenter++; |
| @@ -110,7 +110,7 @@ static void ri_tasklet(unsigned long dev) | |||
| 110 | } | 110 | } |
| 111 | } | 111 | } |
| 112 | 112 | ||
| 113 | if (spin_trylock(&_dev->xmit_lock)) { | 113 | if (netif_tx_trylock(_dev)) { |
| 114 | dp->st_rxq_check++; | 114 | dp->st_rxq_check++; |
| 115 | if ((skb = skb_peek(&dp->rq)) == NULL) { | 115 | if ((skb = skb_peek(&dp->rq)) == NULL) { |
| 116 | dp->tasklet_pending = 0; | 116 | dp->tasklet_pending = 0; |
| @@ -118,10 +118,10 @@ static void ri_tasklet(unsigned long dev) | |||
| 118 | netif_wake_queue(_dev); | 118 | netif_wake_queue(_dev); |
| 119 | } else { | 119 | } else { |
| 120 | dp->st_rxq_rsch++; | 120 | dp->st_rxq_rsch++; |
| 121 | spin_unlock(&_dev->xmit_lock); | 121 | netif_tx_unlock(_dev); |
| 122 | goto resched; | 122 | goto resched; |
| 123 | } | 123 | } |
| 124 | spin_unlock(&_dev->xmit_lock); | 124 | netif_tx_unlock(_dev); |
| 125 | } else { | 125 | } else { |
| 126 | resched: | 126 | resched: |
| 127 | dp->tasklet_pending = 1; | 127 | dp->tasklet_pending = 1; |
