From 973532fc7dfb3b66a32d66fb68c601188858bb49 Mon Sep 17 00:00:00 2001 From: Marcelo Araujo Date: Sun, 4 Oct 2015 08:00:29 +0000 Subject: [PATCH] Remove per complete the fec aggregation protocol. The remove began with revision r271733. NOTE: This patch must never be merge to 10-Stable Reviewed by: glebius Approved by: bapt (mentor) Relnotes: Yes Sponsored by: EuroBSDCon Sweden. Differential Revision: D3786 --- sys/net/if_lagg.c | 9 --------- sys/net/if_lagg.h | 2 -- 2 files changed, 11 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index b623493b8d2a..ab67b93d4ab0 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -220,13 +220,6 @@ static const struct lagg_proto { .pr_request = lacp_req, .pr_portreq = lacp_portreq, }, - { - .pr_num = LAGG_PROTO_ETHERCHANNEL, - .pr_attach = lagg_lb_attach, - .pr_detach = lagg_lb_detach, - .pr_start = lagg_lb_start, - .pr_input = lagg_lb_input, - }, { .pr_num = LAGG_PROTO_BROADCAST, .pr_start = lagg_bcast_start, @@ -1125,7 +1118,6 @@ lagg_port2req(struct lagg_port *lp, struct lagg_reqport *rp) case LAGG_PROTO_ROUNDROBIN: case LAGG_PROTO_LOADBALANCE: - case LAGG_PROTO_ETHERCHANNEL: case LAGG_PROTO_BROADCAST: if (LAGG_PORTACTIVE(lp)) rp->rp_flags |= LAGG_PORT_ACTIVE; @@ -1759,7 +1751,6 @@ lagg_linkstate(struct lagg_softc *sc) break; case LAGG_PROTO_ROUNDROBIN: case LAGG_PROTO_LOADBALANCE: - case LAGG_PROTO_ETHERCHANNEL: case LAGG_PROTO_BROADCAST: speed = 0; SLIST_FOREACH(lp, &sc->sc_ports, lp_entries) diff --git a/sys/net/if_lagg.h b/sys/net/if_lagg.h index bb5ea23b519e..956c238ece86 100644 --- a/sys/net/if_lagg.h +++ b/sys/net/if_lagg.h @@ -53,7 +53,6 @@ typedef enum { LAGG_PROTO_FAILOVER, /* active failover */ LAGG_PROTO_LOADBALANCE, /* loadbalance */ LAGG_PROTO_LACP, /* 802.3ad lacp */ - LAGG_PROTO_ETHERCHANNEL,/* Cisco FEC */ LAGG_PROTO_BROADCAST, /* broadcast */ LAGG_PROTO_MAX, } lagg_proto; @@ -66,7 +65,6 @@ struct lagg_protos { #define LAGG_PROTO_DEFAULT LAGG_PROTO_FAILOVER #define LAGG_PROTOS { \ { "failover", LAGG_PROTO_FAILOVER }, \ - { "fec", LAGG_PROTO_ETHERCHANNEL }, \ { "lacp", LAGG_PROTO_LACP }, \ { "loadbalance", LAGG_PROTO_LOADBALANCE }, \ { "roundrobin", LAGG_PROTO_ROUNDROBIN }, \