aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c')
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index e575e89c7d46..dd8ee56396b2 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -2363,7 +2363,7 @@ static int bnx2x_pkt_req_lin(struct bnx2x *bp, struct sk_buff *skb,
2363 /* Calculate the first sum - it's special */ 2363 /* Calculate the first sum - it's special */
2364 for (frag_idx = 0; frag_idx < wnd_size - 1; frag_idx++) 2364 for (frag_idx = 0; frag_idx < wnd_size - 1; frag_idx++)
2365 wnd_sum += 2365 wnd_sum +=
2366 skb_shinfo(skb)->frags[frag_idx].size; 2366 skb_frag_size(&skb_shinfo(skb)->frags[frag_idx]);
2367 2367
2368 /* If there was data on linear skb data - check it */ 2368 /* If there was data on linear skb data - check it */
2369 if (first_bd_sz > 0) { 2369 if (first_bd_sz > 0) {
@@ -2379,14 +2379,14 @@ static int bnx2x_pkt_req_lin(struct bnx2x *bp, struct sk_buff *skb,
2379 check all windows */ 2379 check all windows */
2380 for (wnd_idx = 0; wnd_idx <= num_wnds; wnd_idx++) { 2380 for (wnd_idx = 0; wnd_idx <= num_wnds; wnd_idx++) {
2381 wnd_sum += 2381 wnd_sum +=
2382 skb_shinfo(skb)->frags[wnd_idx + wnd_size - 1].size; 2382 skb_frag_size(&skb_shinfo(skb)->frags[wnd_idx + wnd_size - 1]);
2383 2383
2384 if (unlikely(wnd_sum < lso_mss)) { 2384 if (unlikely(wnd_sum < lso_mss)) {
2385 to_copy = 1; 2385 to_copy = 1;
2386 break; 2386 break;
2387 } 2387 }
2388 wnd_sum -= 2388 wnd_sum -=
2389 skb_shinfo(skb)->frags[wnd_idx].size; 2389 skb_frag_size(&skb_shinfo(skb)->frags[wnd_idx]);
2390 } 2390 }
2391 } else { 2391 } else {
2392 /* in non-LSO too fragmented packet should always 2392 /* in non-LSO too fragmented packet should always
@@ -2796,8 +2796,8 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
2796 for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { 2796 for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
2797 skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; 2797 skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
2798 2798
2799 mapping = skb_frag_dma_map(&bp->pdev->dev, frag, 0, frag->size, 2799 mapping = skb_frag_dma_map(&bp->pdev->dev, frag, 0,
2800 DMA_TO_DEVICE); 2800 skb_frag_size(frag), DMA_TO_DEVICE);
2801 if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) { 2801 if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {
2802 2802
2803 DP(NETIF_MSG_TX_QUEUED, "Unable to map page - " 2803 DP(NETIF_MSG_TX_QUEUED, "Unable to map page - "
@@ -2821,8 +2821,8 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
2821 2821
2822 tx_data_bd->addr_hi = cpu_to_le32(U64_HI(mapping)); 2822 tx_data_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
2823 tx_data_bd->addr_lo = cpu_to_le32(U64_LO(mapping)); 2823 tx_data_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
2824 tx_data_bd->nbytes = cpu_to_le16(frag->size); 2824 tx_data_bd->nbytes = cpu_to_le16(skb_frag_size(frag));
2825 le16_add_cpu(&pkt_size, frag->size); 2825 le16_add_cpu(&pkt_size, skb_frag_size(frag));
2826 nbd++; 2826 nbd++;
2827 2827
2828 DP(NETIF_MSG_TX_QUEUED, 2828 DP(NETIF_MSG_TX_QUEUED,