diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-11 12:00:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-11 12:00:37 -0700 |
| commit | cdf0969763e020923abe28fddc605add572febc2 (patch) | |
| tree | bc568521de044fb42db344a3c5d2625f0029ac0f /net/bridge | |
| parent | 2c9c3bbbbfe9f7f700c30d9ac40c1abca59d39ee (diff) | |
| download | op-kernel-dev-cdf0969763e020923abe28fddc605add572febc2.zip op-kernel-dev-cdf0969763e020923abe28fddc605add572febc2.tar.gz | |
Revert "Merge branch 'mv88e6xxx-switchdev-fdb'"
This reverts commit f1d5ca434413b20cd3f8c18ff2b634b7782149a5, reversing
changes made to 4933d85c5173832ebd261756522095837583c458.
I applied v2 instead of v3.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_fdb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 5656b44..9e9875d 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -136,11 +136,11 @@ static void fdb_del_external_learn(struct net_bridge_fdb_entry *f) struct switchdev_obj obj = { .id = SWITCHDEV_OBJ_PORT_FDB, .u.fdb = { + .addr = f->addr.addr, .vid = f->vlan_id, }, }; - ether_addr_copy(obj.u.fdb.addr, f->addr.addr); switchdev_port_obj_del(f->dst->dev, &obj); } |
