OSDN Git Service

(root) / tomoyo / tomoyo-test1.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9274124) | patch
net: dsa: remove duplicate assignment in dsa_slave_add_cls_matchall_mirred
authorVladimir Oltean <vladimir.oltean@nxp.com>
Mon, 4 May 2020 19:58:56 +0000 (22:58 +0300)
committerDavid S. Miller <davem@davemloft.net>
Thu, 7 May 2020 00:30:35 +0000 (17:30 -0700)
commit657221598f820ff860972b67583fb91d9ab7caf4
tree4dee26f1fb5be50f51a9d85d8acb280814e81740tree | snapshot
parent9274124f023b5c56dc4326637d4f787968b03607commit | diff
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>
net/dsa/slave.c diff | blob | history
This is a test repository.
About OSDN
Find Software
Develop Software
Help