diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2016-06-04 22:17:00 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-05 00:29:53 +0300 |
| commit | 66472fc04e8be62858f29c7798ed17e984c1ab3b (patch) | |
| tree | 7f1dd73e2bf0c8dac71112e707a4588e67d678e4 /drivers/net/dsa | |
| parent | 4a7704ffa86705b0580b6473c407b7b7618e072d (diff) | |
| download | linux-66472fc04e8be62858f29c7798ed17e984c1ab3b.tar.xz | |
net: dsa: Copy the routing table into the switch structure
The new binding will not have a chip data structure, it will place the
routing directly into the switch structure. To enable backwards
compatibility, copy the routing from the chip data into the switch
structure.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa')
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c index d622c0fb76cc..492801a6398c 100644 --- a/drivers/net/dsa/mv88e6xxx.c +++ b/drivers/net/dsa/mv88e6xxx.c @@ -3024,8 +3024,8 @@ static int mv88e6xxx_setup_global(struct mv88e6xxx_priv_state *ps) for (i = 0; i < 32; i++) { int nexthop = 0x1f; - if (i != ps->ds->index && i < ps->ds->dst->pd->nr_chips) - nexthop = ps->ds->cd->rtable[i] & 0x1f; + if (i != ds->index && i < DSA_MAX_SWITCHES) + nexthop = ds->rtable[i] & 0x1f; err = _mv88e6xxx_reg_write( ps, REG_GLOBAL2, |