diff options
| author | Visa Hankala <visa@cvs.openbsd.org> | 2016-06-22 13:09:36 +0000 |
|---|---|---|
| committer | Visa Hankala <visa@cvs.openbsd.org> | 2016-06-22 13:09:36 +0000 |
| commit | 4eabd8f63f2d931a9c5d375c0e773cb72ce7a1f6 (patch) | |
| tree | 6392428c1ce8f6bea2cc4c772576a577035e7990 /sys/arch/octeon/dev/if_cnmac.c | |
| parent | ad1747a2d1db537a946a003b331e1280ac4ce939 (diff) | |
Add support for the second GMX interface on Octeon II. This enables
ports eth[0-3] on 8-port EdgeRouters. Currently, port eth0 maps to
network interface cnmac4, eth1 to cnmac5 etc.
ok dlg@, tested by martijn@
Diffstat (limited to 'sys/arch/octeon/dev/if_cnmac.c')
| -rw-r--r-- | sys/arch/octeon/dev/if_cnmac.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/octeon/dev/if_cnmac.c b/sys/arch/octeon/dev/if_cnmac.c index 0a53adbd236..a2e30d7d8d8 100644 --- a/sys/arch/octeon/dev/if_cnmac.c +++ b/sys/arch/octeon/dev/if_cnmac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cnmac.c,v 1.51 2016/05/30 15:41:28 visa Exp $ */ +/* $OpenBSD: if_cnmac.c,v 1.52 2016/06/22 13:09:35 visa Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -289,8 +289,8 @@ octeon_eth_attach(struct device *parent, struct device *self, void *aux) timeout_set(&sc->sc_tick_free_ch, octeon_eth_tick_free, sc); cn30xxfau_op_init(&sc->sc_fau_done, - OCTEON_CVMSEG_ETHER_OFFSET(sc->sc_port, csm_ether_fau_done), - OCT_FAU_REG_ADDR_END - (8 * (sc->sc_port + 1))/* XXX */); + OCTEON_CVMSEG_ETHER_OFFSET(sc->sc_dev.dv_unit, csm_ether_fau_done), + OCT_FAU_REG_ADDR_END - (8 * (sc->sc_dev.dv_unit + 1))/* XXX */); cn30xxfau_op_set_8(&sc->sc_fau_done, 0); octeon_eth_pip_init(sc); |