summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCamelia Groza <camelia.groza@nxp.com>2017-02-27 15:35:24 (GMT)
committerXie Xiaobo <xiaobo.xie@nxp.com>2017-09-25 07:25:49 (GMT)
commit2949daa11fa5671ac8d1902d75ba78653525d7a5 (patch)
treee14d1d133c73dee0c7ef2c18770677805f80a4fe
parent291bafd9a4c355cec95ba07bbd6c028c52dc611e (diff)
downloadlinux-2949daa11fa5671ac8d1902d75ba78653525d7a5.tar.xz
dpaa_eth: ls1043a errata: check if the skb is linear after 4k splitting
Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
-rw-r--r--drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c4
1 files changed, 3 insertions, 1 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 45fd796..8f1bb87 100644
--- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c
+++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c
@@ -1030,7 +1030,7 @@ int __hot dpa_tx_extended(struct sk_buff *skb, struct net_device *net_dev,
struct dpa_percpu_priv_s *percpu_priv;
struct rtnl_link_stats64 *percpu_stats;
int err = 0;
- const bool nonlinear = skb_is_nonlinear(skb);
+ bool nonlinear;
int *countptr, offset = 0;
priv = netdev_priv(net_dev);
@@ -1060,6 +1060,8 @@ int __hot dpa_tx_extended(struct sk_buff *skb, struct net_device *net_dev,
}
#endif
+ nonlinear = skb_is_nonlinear(skb);
+
/* MAX_SKB_FRAGS is larger than our DPA_SGT_MAX_ENTRIES; make sure
* we don't feed FMan with more fragments than it supports.
* Btw, we're using the first sgt entry to store the linear part of