[PATCH v2 net] net: dsa: remove duplicate assignment in dsa_slave_add_cls_matchall_mirred

[PATCH v2 net] net: dsa: remove duplicate assignment in dsa_slave_add_cls_matchall_mirred

[Vladimir Oltean]

From: Vladimir Oltean <vladimir.oltean@nxp.com>

This was caused by a poor merge conflict resolution on my side. The
"act = &cls->rule->action.entries[0];" assignment was already present in
the code prior to the patch mentioned below.

Fixes: e13c2075280e ("net: dsa: refactor matchall mirred action to separate function")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
Changes in v2:
Forgot to copy the netdev list.

 net/dsa/slave.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index ba8bf90dc0cc..a7f5fe64c2f3 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -856,20 +856,18 @@ dsa_slave_add_cls_matchall_mirred(struct net_device *dev,
 	struct dsa_port *to_dp;
 	int err;
 
-	act = &cls->rule->action.entries[0];
-
 	if (!ds->ops->port_mirror_add)
 		return -EOPNOTSUPP;
 
-	if (!act->dev)
-		return -EINVAL;
-
 	if (!flow_action_basic_hw_stats_check(&cls->rule->action,
 					      cls->common.extack))
 		return -EOPNOTSUPP;
 
 	act = &cls->rule->action.entries[0];
 
+	if (!act->dev)
+		return -EINVAL;
+
 	if (!dsa_slave_dev_check(act->dev))
 		return -EOPNOTSUPP;
 
-- 
2.17.1

Re: [PATCH v2 net] net: dsa: remove duplicate assignment in dsa_slave_add_cls_matchall_mirred

[David Miller]

From: Vladimir Oltean <olteanv@gmail.com>
Date: Mon,  4 May 2020 22:58:56 +0300

> From: Vladimir Oltean <vladimir.oltean@nxp.com>
> 
> This was caused by a poor merge conflict resolution on my side. The
> "act = &cls->rule->action.entries[0];" assignment was already present in
> the code prior to the patch mentioned below.
> 
> Fixes: e13c2075280e ("net: dsa: refactor matchall mirred action to separate function")
> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>

Applied, thanks.