diff options
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb3/sge.c')
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb3/sge.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c index 20b6e1b3f5e3..89db739b7819 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c | |||
| @@ -620,7 +620,7 @@ static void *alloc_ring(struct pci_dev *pdev, size_t nelem, size_t elem_size, | |||
| 620 | { | 620 | { |
| 621 | size_t len = nelem * elem_size; | 621 | size_t len = nelem * elem_size; |
| 622 | void *s = NULL; | 622 | void *s = NULL; |
| 623 | void *p = dma_zalloc_coherent(&pdev->dev, len, phys, GFP_KERNEL); | 623 | void *p = dma_alloc_coherent(&pdev->dev, len, phys, GFP_KERNEL); |
| 624 | 624 | ||
| 625 | if (!p) | 625 | if (!p) |
| 626 | return NULL; | 626 | return NULL; |
| @@ -2381,7 +2381,7 @@ no_mem: | |||
| 2381 | lro_add_page(adap, qs, fl, | 2381 | lro_add_page(adap, qs, fl, |
| 2382 | G_RSPD_LEN(len), | 2382 | G_RSPD_LEN(len), |
| 2383 | flags & F_RSPD_EOP); | 2383 | flags & F_RSPD_EOP); |
| 2384 | goto next_fl; | 2384 | goto next_fl; |
| 2385 | } | 2385 | } |
| 2386 | 2386 | ||
| 2387 | skb = get_packet_pg(adap, fl, q, | 2387 | skb = get_packet_pg(adap, fl, q, |
| @@ -3214,11 +3214,13 @@ void t3_start_sge_timers(struct adapter *adap) | |||
| 3214 | for (i = 0; i < SGE_QSETS; ++i) { | 3214 | for (i = 0; i < SGE_QSETS; ++i) { |
| 3215 | struct sge_qset *q = &adap->sge.qs[i]; | 3215 | struct sge_qset *q = &adap->sge.qs[i]; |
| 3216 | 3216 | ||
| 3217 | if (q->tx_reclaim_timer.function) | 3217 | if (q->tx_reclaim_timer.function) |
| 3218 | mod_timer(&q->tx_reclaim_timer, jiffies + TX_RECLAIM_PERIOD); | 3218 | mod_timer(&q->tx_reclaim_timer, |
| 3219 | jiffies + TX_RECLAIM_PERIOD); | ||
| 3219 | 3220 | ||
| 3220 | if (q->rx_reclaim_timer.function) | 3221 | if (q->rx_reclaim_timer.function) |
| 3221 | mod_timer(&q->rx_reclaim_timer, jiffies + RX_RECLAIM_PERIOD); | 3222 | mod_timer(&q->rx_reclaim_timer, |
| 3223 | jiffies + RX_RECLAIM_PERIOD); | ||
| 3222 | } | 3224 | } |
| 3223 | } | 3225 | } |
| 3224 | 3226 | ||
