summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c
index 53ce077..32bff99 100644
--- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c
+++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c
@@ -1028,7 +1028,6 @@ int __hot dpa_tx_extended(struct sk_buff *skb, struct net_device *net_dev,
#endif /* CONFIG_FSL_DPAA_TS */
#ifndef CONFIG_PPC
-realign_4k:
if (unlikely(dpaa_errata_a010022) && a010022_check_skb(skb)) {
skb = a010022_realign_skb(skb);
if (!skb)
@@ -1075,8 +1074,11 @@ realign_4k:
skb = nskb;
#ifndef CONFIG_PPC
if (unlikely(dpaa_errata_a010022) &&
- a010022_check_skb(skb))
- goto realign_4k;
+ a010022_check_skb(skb)) {
+ skb = realign_skb(skb);
+ if (!skb)
+ goto skb_to_fd_failed;
+ }
#endif
/* skb_copy() has now linearized the skbuff. */
} else if (unlikely(nonlinear)) {