|
@@ -586,7 +586,7 @@ static inline int bnxt_alloc_rx_page(struct bnxt *bp,
|
|
|
if (!page)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
- mapping = dma_map_page(&pdev->dev, page, 0, PAGE_SIZE,
|
|
|
+ mapping = dma_map_page(&pdev->dev, page, 0, BNXT_RX_PAGE_SIZE,
|
|
|
PCI_DMA_FROMDEVICE);
|
|
|
if (dma_mapping_error(&pdev->dev, mapping)) {
|
|
|
__free_page(page);
|
|
@@ -740,7 +740,7 @@ static struct sk_buff *bnxt_rx_pages(struct bnxt *bp, struct bnxt_napi *bnapi,
|
|
|
return NULL;
|
|
|
}
|
|
|
|
|
|
- dma_unmap_page(&pdev->dev, mapping, PAGE_SIZE,
|
|
|
+ dma_unmap_page(&pdev->dev, mapping, BNXT_RX_PAGE_SIZE,
|
|
|
PCI_DMA_FROMDEVICE);
|
|
|
|
|
|
skb->data_len += frag_len;
|
|
@@ -1584,7 +1584,7 @@ static void bnxt_free_rx_skbs(struct bnxt *bp)
|
|
|
|
|
|
dma_unmap_page(&pdev->dev,
|
|
|
dma_unmap_addr(rx_agg_buf, mapping),
|
|
|
- PAGE_SIZE, PCI_DMA_FROMDEVICE);
|
|
|
+ BNXT_RX_PAGE_SIZE, PCI_DMA_FROMDEVICE);
|
|
|
|
|
|
rx_agg_buf->page = NULL;
|
|
|
__clear_bit(j, rxr->rx_agg_bmap);
|
|
@@ -1973,7 +1973,7 @@ static int bnxt_init_one_rx_ring(struct bnxt *bp, int ring_nr)
|
|
|
if (!(bp->flags & BNXT_FLAG_AGG_RINGS))
|
|
|
return 0;
|
|
|
|
|
|
- type = ((u32)PAGE_SIZE << RX_BD_LEN_SHIFT) |
|
|
|
+ type = ((u32)BNXT_RX_PAGE_SIZE << RX_BD_LEN_SHIFT) |
|
|
|
RX_BD_TYPE_RX_AGG_BD | RX_BD_FLAGS_SOP;
|
|
|
|
|
|
bnxt_init_rxbd_pages(ring, type);
|
|
@@ -2164,7 +2164,7 @@ void bnxt_set_ring_params(struct bnxt *bp)
|
|
|
bp->rx_agg_nr_pages = 0;
|
|
|
|
|
|
if (bp->flags & BNXT_FLAG_TPA)
|
|
|
- agg_factor = 4;
|
|
|
+ agg_factor = min_t(u32, 4, 65536 / BNXT_RX_PAGE_SIZE);
|
|
|
|
|
|
bp->flags &= ~BNXT_FLAG_JUMBO;
|
|
|
if (rx_space > PAGE_SIZE) {
|
|
@@ -3020,12 +3020,12 @@ static int bnxt_hwrm_vnic_set_tpa(struct bnxt *bp, u16 vnic_id, u32 tpa_flags)
|
|
|
/* Number of segs are log2 units, and first packet is not
|
|
|
* included as part of this units.
|
|
|
*/
|
|
|
- if (mss <= PAGE_SIZE) {
|
|
|
- n = PAGE_SIZE / mss;
|
|
|
+ if (mss <= BNXT_RX_PAGE_SIZE) {
|
|
|
+ n = BNXT_RX_PAGE_SIZE / mss;
|
|
|
nsegs = (MAX_SKB_FRAGS - 1) * n;
|
|
|
} else {
|
|
|
- n = mss / PAGE_SIZE;
|
|
|
- if (mss & (PAGE_SIZE - 1))
|
|
|
+ n = mss / BNXT_RX_PAGE_SIZE;
|
|
|
+ if (mss & (BNXT_RX_PAGE_SIZE - 1))
|
|
|
n++;
|
|
|
nsegs = (MAX_SKB_FRAGS - n) / n;
|
|
|
}
|