Updated from Linux LTS 3.10.23 to 3.10.24
This commit is contained in:
@@ -6722,12 +6722,6 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
|
||||
pci_unmap_single(tp->pdev, dma_addr, skb_size,
|
||||
PCI_DMA_FROMDEVICE);
|
||||
|
||||
skb = build_skb(data, frag_size);
|
||||
if (!skb) {
|
||||
tg3_frag_free(frag_size != 0, data);
|
||||
goto drop_it_no_recycle;
|
||||
}
|
||||
skb_reserve(skb, TG3_RX_OFFSET(tp));
|
||||
/* Ensure that the update to the data happens
|
||||
* after the usage of the old DMA mapping.
|
||||
*/
|
||||
@@ -6735,6 +6729,12 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
|
||||
|
||||
ri->data = NULL;
|
||||
|
||||
skb = build_skb(data, frag_size);
|
||||
if (!skb) {
|
||||
tg3_frag_free(frag_size != 0, data);
|
||||
goto drop_it_no_recycle;
|
||||
}
|
||||
skb_reserve(skb, TG3_RX_OFFSET(tp));
|
||||
} else {
|
||||
tg3_recycle_rx(tnapi, tpr, opaque_key,
|
||||
desc_idx, *post_ptr);
|
||||
|
||||
Reference in New Issue
Block a user