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.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.c')
| -rw-r--r-- | sys/net/if.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index 5eee0d4..73020da 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -96,7 +96,7 @@ SYSCTL_INT(_net_link, OID_AUTO, log_link_state_change, CTLFLAG_RW, void (*bstp_linkstate_p)(struct ifnet *ifp, int state); void (*ng_ether_link_state_p)(struct ifnet *ifp, int state); -void (*trunk_linkstate_p)(struct ifnet *ifp, int state); +void (*lagg_linkstate_p)(struct ifnet *ifp, int state); struct mbuf *(*tbr_dequeue_ptr)(struct ifaltq *, int) = NULL; @@ -1379,9 +1379,9 @@ do_link_state_change(void *arg, int pending) KASSERT(bstp_linkstate_p != NULL,("if_bridge bstp not loaded!")); (*bstp_linkstate_p)(ifp, link_state); } - if (ifp->if_trunk) { - KASSERT(trunk_linkstate_p != NULL,("if_trunk not loaded!")); - (*trunk_linkstate_p)(ifp, link_state); + if (ifp->if_lagg) { + KASSERT(lagg_linkstate_p != NULL,("if_lagg not loaded!")); + (*lagg_linkstate_p)(ifp, link_state); } devctl_notify("IFNET", ifp->if_xname, |
