|
@@ -1197,10 +1197,8 @@ fec_enet_tx_queue(struct net_device *ndev, u16 queue_id)
|
|
|
fec16_to_cpu(bdp->cbd_datlen),
|
|
|
DMA_TO_DEVICE);
|
|
|
bdp->cbd_bufaddr = cpu_to_fec32(0);
|
|
|
- if (!skb) {
|
|
|
- bdp = fec_enet_get_nextdesc(bdp, &txq->bd);
|
|
|
- continue;
|
|
|
- }
|
|
|
+ if (!skb)
|
|
|
+ goto skb_done;
|
|
|
|
|
|
/* Check for errors. */
|
|
|
if (status & (BD_ENET_TX_HB | BD_ENET_TX_LC |
|
|
@@ -1239,7 +1237,7 @@ fec_enet_tx_queue(struct net_device *ndev, u16 queue_id)
|
|
|
|
|
|
/* Free the sk buffer associated with this last transmit */
|
|
|
dev_kfree_skb_any(skb);
|
|
|
-
|
|
|
+skb_done:
|
|
|
/* Make sure the update to bdp and tx_skbuff are performed
|
|
|
* before dirty_tx
|
|
|
*/
|