Commit 65722159 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller

net: dsa: remove duplicate assignment in dsa_slave_add_cls_matchall_mirred

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: e13c2075 ("net: dsa: refactor matchall mirred action to separate function")
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9274124f
...@@ -856,20 +856,18 @@ dsa_slave_add_cls_matchall_mirred(struct net_device *dev, ...@@ -856,20 +856,18 @@ dsa_slave_add_cls_matchall_mirred(struct net_device *dev,
struct dsa_port *to_dp; struct dsa_port *to_dp;
int err; int err;
act = &cls->rule->action.entries[0];
if (!ds->ops->port_mirror_add) if (!ds->ops->port_mirror_add)
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (!act->dev)
return -EINVAL;
if (!flow_action_basic_hw_stats_check(&cls->rule->action, if (!flow_action_basic_hw_stats_check(&cls->rule->action,
cls->common.extack)) cls->common.extack))
return -EOPNOTSUPP; return -EOPNOTSUPP;
act = &cls->rule->action.entries[0]; act = &cls->rule->action.entries[0];
if (!act->dev)
return -EINVAL;
if (!dsa_slave_dev_check(act->dev)) if (!dsa_slave_dev_check(act->dev))
return -EOPNOTSUPP; return -EOPNOTSUPP;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment