diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-11 21:00:37 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-11 21:00:37 +0200 |
| commit | cdf0969763e020923abe28fddc605add572febc2 (patch) | |
| tree | bc568521de044fb42db344a3c5d2625f0029ac0f /drivers/net/ethernet/rocker/rocker.c | |
| parent | bpf: s390: Fix build error caused by the struct bpf_array member name changed (diff) | |
| download | linux-cdf0969763e020923abe28fddc605add572febc2.tar.xz linux-cdf0969763e020923abe28fddc605add572febc2.zip | |
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 'drivers/net/ethernet/rocker/rocker.c')
| -rw-r--r-- | drivers/net/ethernet/rocker/rocker.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c index 80bb25c5a644..b77e0e7307d4 100644 --- a/drivers/net/ethernet/rocker/rocker.c +++ b/drivers/net/ethernet/rocker/rocker.c @@ -4543,7 +4543,7 @@ static int rocker_port_fdb_dump(const struct rocker_port *rocker_port, hash_for_each_safe(rocker->fdb_tbl, bkt, tmp, found, entry) { if (found->key.pport != rocker_port->pport) continue; - ether_addr_copy(fdb->addr, found->key.addr); + fdb->addr = found->key.addr; fdb->vid = rocker_port_vlan_to_vid(rocker_port, found->key.vlan_id); err = obj->cb(rocker_port->dev, obj); |