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/if_ethersubr.c | |
| 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/if_ethersubr.c')
| -rw-r--r-- | sys/net/if_ethersubr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 0ebdc56..acf0846 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -113,8 +113,8 @@ int (*bridge_output_p)(struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); void (*bridge_dn_p)(struct mbuf *, struct ifnet *); -/* if_trunk(4) support */ -struct mbuf *(*trunk_input_p)(struct ifnet *, struct mbuf *); +/* if_lagg(4) support */ +struct mbuf *(*lagg_input_p)(struct ifnet *, struct mbuf *); static const u_char etherbroadcastaddr[ETHER_ADDR_LEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; @@ -605,11 +605,11 @@ ether_input(struct ifnet *ifp, struct mbuf *m) return; } - /* Handle input from a trunk(4) port */ + /* Handle input from a lagg(4) port */ if (ifp->if_type == IFT_IEEE8023ADLAG) { - KASSERT(trunk_input_p != NULL, - ("%s: if_trunk not loaded!", __func__)); - m = (*trunk_input_p)(ifp, m); + KASSERT(lagg_input_p != NULL, + ("%s: if_lagg not loaded!", __func__)); + m = (*lagg_input_p)(ifp, m); if (m != NULL) ifp = m->m_pkthdr.rcvif; else |
