diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2020-05-04 22:58:56 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-06 17:30:35 -0700 |
| commit | 657221598f820ff860972b67583fb91d9ab7caf4 (patch) | |
| tree | 4dee26f1fb5be50f51a9d85d8acb280814e81740 | |
| parent | 9274124f023b5c56dc4326637d4f787968b03607 (diff) | |
| download | linux-stable-657221598f820ff860972b67583fb91d9ab7caf4.tar.gz linux-stable-657221598f820ff860972b67583fb91d9ab7caf4.tar.bz2 linux-stable-657221598f820ff860972b67583fb91d9ab7caf4.zip | |
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: e13c2075280e ("net: dsa: refactor matchall mirred action to separate function")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/dsa/slave.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index d1068803cd11..62f4ee3da172 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; |