aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/broadcom/tg3.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 819d87c281bf..00c5be8c55b8 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -6862,12 +6862,6 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
6862 pci_unmap_single(tp->pdev, dma_addr, skb_size, 6862 pci_unmap_single(tp->pdev, dma_addr, skb_size,
6863 PCI_DMA_FROMDEVICE); 6863 PCI_DMA_FROMDEVICE);
6864 6864
6865 skb = build_skb(data, frag_size);
6866 if (!skb) {
6867 tg3_frag_free(frag_size != 0, data);
6868 goto drop_it_no_recycle;
6869 }
6870 skb_reserve(skb, TG3_RX_OFFSET(tp));
6871 /* Ensure that the update to the data happens 6865 /* Ensure that the update to the data happens
6872 * after the usage of the old DMA mapping. 6866 * after the usage of the old DMA mapping.
6873 */ 6867 */
@@ -6875,6 +6869,12 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
6875 6869
6876 ri->data = NULL; 6870 ri->data = NULL;
6877 6871
6872 skb = build_skb(data, frag_size);
6873 if (!skb) {
6874 tg3_frag_free(frag_size != 0, data);
6875 goto drop_it_no_recycle;
6876 }
6877 skb_reserve(skb, TG3_RX_OFFSET(tp));
6878 } else { 6878 } else {
6879 tg3_recycle_rx(tnapi, tpr, opaque_key, 6879 tg3_recycle_rx(tnapi, tpr, opaque_key,
6880 desc_idx, *post_ptr); 6880 desc_idx, *post_ptr);