Author: araujo
Date: Sun Oct 4 08:00:29 2015
New Revision: 288654
URL: https://svnweb.freebsd.org/changeset/base/288654
Log:
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
Modified:
head/sys/net/if_lagg.c
head/sys/net/if_lagg.h
Modified: head/sys/net/if_lagg.c
==============================================================================
--- head/sys/net/if_lagg.c Sun Oct 4 07:45:36 2015 (r288653)
+++ head/sys/net/if_lagg.c Sun Oct 4 08:00:29 2015 (r288654)
@@ -221,13 +221,6 @@ static const struct lagg_proto {
.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,
.pr_input = lagg_bcast_input,
@@ -1125,7 +1118,6 @@ lagg_port2req(struct lagg_port *lp, stru
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)
Modified: head/sys/net/if_lagg.h
==============================================================================
--- head/sys/net/if_lagg.h Sun Oct 4 07:45:36 2015 (r288653)
+++ head/sys/net/if_lagg.h Sun Oct 4 08:00:29 2015 (r288654)
@@ -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 }, \
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
