| From 9d65e42410483132243770c272eaa7e7da6e9b0f Mon Sep 17 00:00:00 2001 |
| From: Ioana Ciocoi Radulescu <ruxandra.radulescu@nxp.com> |
| Date: Tue, 16 Apr 2019 17:13:28 +0000 |
| Subject: dpaa2-eth: Fix Rx classification status |
| |
| [ Upstream commit df8e249be866e2f762be11b14a9e7a94752614d4 ] |
| |
| Set the Rx flow classification enable flag only if key config |
| operation is successful. |
| |
| Fixes 3f9b5c9 ("dpaa2-eth: Configure Rx flow classification key") |
| |
| Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 7 ++++++- |
| 1 file changed, 6 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c |
| index dc339dc1adb21..57cbaa38d2477 100644 |
| --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c |
| +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c |
| @@ -2796,6 +2796,7 @@ int dpaa2_eth_set_hash(struct net_device *net_dev, u64 flags) |
| static int dpaa2_eth_set_cls(struct dpaa2_eth_priv *priv) |
| { |
| struct device *dev = priv->net_dev->dev.parent; |
| + int err; |
| |
| /* Check if we actually support Rx flow classification */ |
| if (dpaa2_eth_has_legacy_dist(priv)) { |
| @@ -2814,9 +2815,13 @@ static int dpaa2_eth_set_cls(struct dpaa2_eth_priv *priv) |
| return -EOPNOTSUPP; |
| } |
| |
| + err = dpaa2_eth_set_dist_key(priv->net_dev, DPAA2_ETH_RX_DIST_CLS, 0); |
| + if (err) |
| + return err; |
| + |
| priv->rx_cls_enabled = 1; |
| |
| - return dpaa2_eth_set_dist_key(priv->net_dev, DPAA2_ETH_RX_DIST_CLS, 0); |
| + return 0; |
| } |
| |
| /* Bind the DPNI to its needed objects and resources: buffer pool, DPIOs, |
| -- |
| 2.20.1 |
| |
