diff options
| author | thompsa <thompsa@FreeBSD.org> | 2007-04-17 00:35:11 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2007-04-17 00:35:11 +0000 |
| commit | 5fc175b7b49fb508d186e2eadee5104c2f774e24 (patch) | |
| tree | 5ab1db16648abde2519f28c871592804af2cc1d6 /sys/net/ieee8023ad_lacp.h | |
| parent | fc861d6ddfef1ad969b1beb206c79466f51bb0fb (diff) | |
| download | FreeBSD-src-5fc175b7b49fb508d186e2eadee5104c2f774e24.zip FreeBSD-src-5fc175b7b49fb508d186e2eadee5104c2f774e24.tar.gz | |
Rename the trunk(4) driver to lagg(4) as it is too similar to vlan trunking.
The name trunk is misused as the networking term trunk means carrying multiple
VLANs over a single connection. The IEEE standard for link aggregation (802.3
section 3) does not talk about 'trunk' at all while it is used throughout IEEE
802.1Q in describing vlans.
The lagg(4) driver provides link aggregation, failover and fault tolerance.
Discussed on: current@
Diffstat (limited to 'sys/net/ieee8023ad_lacp.h')
| -rw-r--r-- | sys/net/ieee8023ad_lacp.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sys/net/ieee8023ad_lacp.h b/sys/net/ieee8023ad_lacp.h index 95d3ae96..5b053dd 100644 --- a/sys/net/ieee8023ad_lacp.h +++ b/sys/net/ieee8023ad_lacp.h @@ -177,7 +177,7 @@ struct lacp_port { TAILQ_ENTRY(lacp_port) lp_dist_q; LIST_ENTRY(lacp_port) lp_next; struct lacp_softc *lp_lsc; - struct trunk_port *lp_trunk; + struct lagg_port *lp_lagg; struct ifnet *lp_ifp; struct lacp_peerinfo lp_partner; struct lacp_peerinfo lp_actor; @@ -205,7 +205,7 @@ struct lacp_aggregator { }; struct lacp_softc { - struct trunk_softc *lsc_trunk; + struct lagg_softc *lsc_lagg; struct lacp_aggregator *lsc_active_aggregator; TAILQ_HEAD(, lacp_aggregator) lsc_aggregators; boolean_t lsc_suppress_distributing; @@ -258,20 +258,20 @@ struct markerdu { #define LACP_STATE_EQ(s1, s2, mask) \ ((((s1) ^ (s2)) & (mask)) == 0) -#define LACP_PORT(_tp) ((struct lacp_port *)(_tp)->tp_psc) -#define LACP_SOFTC(_tr) ((struct lacp_softc *)(_tr)->tr_psc) - -int lacp_input(struct trunk_port *, struct mbuf *); -int lacp_marker_input(struct trunk_port *, struct mbuf *); -struct trunk_port *lacp_select_tx_port(struct trunk_softc *, struct mbuf *); -int lacp_attach(struct trunk_softc *); -int lacp_detach(struct trunk_softc *); -void lacp_init(struct trunk_softc *); -void lacp_stop(struct trunk_softc *); -int lacp_port_create(struct trunk_port *); -void lacp_port_destroy(struct trunk_port *); -void lacp_linkstate(struct trunk_port *); -int lacp_port_isactive(struct trunk_port *); +#define LACP_PORT(_lp) ((struct lacp_port *)(_lp)->lp_psc) +#define LACP_SOFTC(_sc) ((struct lacp_softc *)(_sc)->sc_psc) + +int lacp_input(struct lagg_port *, struct mbuf *); +int lacp_marker_input(struct lagg_port *, struct mbuf *); +struct lagg_port *lacp_select_tx_port(struct lagg_softc *, struct mbuf *); +int lacp_attach(struct lagg_softc *); +int lacp_detach(struct lagg_softc *); +void lacp_init(struct lagg_softc *); +void lacp_stop(struct lagg_softc *); +int lacp_port_create(struct lagg_port *); +void lacp_port_destroy(struct lagg_port *); +void lacp_linkstate(struct lagg_port *); +int lacp_port_isactive(struct lagg_port *); /* following constants don't include terminating NUL */ #define LACP_MACSTR_MAX (2*6 + 5) |
