diff options
| author | Camelia Groza <camelia.groza@nxp.com> | 2017-09-04 10:46:00 (GMT) |
|---|---|---|
| committer | Xie Xiaobo <xiaobo.xie@nxp.com> | 2017-09-25 07:25:48 (GMT) |
| commit | bac9a9586a0ebc38f504aae905fdc86a734f24ed (patch) | |
| tree | 8228cc6067071142e8e439c14dd489e50d520650 /drivers/net/ethernet | |
| parent | f95492b5babe08940f4dcd58d30037d7ab389f83 (diff) | |
| download | linux-bac9a9586a0ebc38f504aae905fdc86a734f24ed.tar.xz | |
sdk_dpaa: ls1043a errata: realign skb in place if needed
Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c | 8 |
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)) { |