Page MenuHomeFreeBSD
Files F145565961

D539.1778207867.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D539.1778207867.diff
View Options

Index: share/man/man4/lagg.4
===================================================================
--- share/man/man4/lagg.4
+++ share/man/man4/lagg.4
@@ -61,7 +61,6 @@
The driver currently supports the aggregation protocols
.Ic failover
(the default),
-.Ic fec ,
.Ic lacp ,
.Ic loadbalance ,
.Ic roundrobin ,
@@ -86,11 +85,6 @@
.Xr sysctl 8
variable to a nonzero value,
which is useful for certain bridged network setups.
-.It Ic fec
-Supports Cisco EtherChannel.
-This is an alias for
-.Ic loadbalance
-mode.
.It Ic lacp
Supports the IEEE 802.1AX (formerly 802.3ad) Link Aggregation Control Protocol
(LACP) and the Marker Protocol.
Index: sys/net/if_lagg.h
===================================================================
--- sys/net/if_lagg.h
+++ sys/net/if_lagg.h
@@ -52,8 +52,7 @@
#define LAGG_PROTO_FAILOVER 2 /* active failover */
#define LAGG_PROTO_LOADBALANCE 3 /* loadbalance */
#define LAGG_PROTO_LACP 4 /* 802.3ad lacp */
-#define LAGG_PROTO_ETHERCHANNEL 5 /* Cisco FEC */
-#define LAGG_PROTO_MAX 6
+#define LAGG_PROTO_MAX 5
struct lagg_protos {
const char *lpr_name;
@@ -63,7 +62,6 @@
#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 }, \
Index: sys/net/if_lagg.c
===================================================================
--- sys/net/if_lagg.c
+++ sys/net/if_lagg.c
@@ -166,7 +166,6 @@
{ LAGG_PROTO_ROUNDROBIN, lagg_rr_attach },
{ LAGG_PROTO_FAILOVER, lagg_fail_attach },
{ LAGG_PROTO_LOADBALANCE, lagg_lb_attach },
- { LAGG_PROTO_ETHERCHANNEL, lagg_lb_attach },
{ LAGG_PROTO_LACP, lagg_lacp_attach },
{ LAGG_PROTO_NONE, NULL }
};
@@ -918,7 +917,6 @@
case LAGG_PROTO_ROUNDROBIN:
case LAGG_PROTO_LOADBALANCE:
- case LAGG_PROTO_ETHERCHANNEL:
if (LAGG_PORTACTIVE(lp))
rp->rp_flags |= LAGG_PORT_ACTIVE;
break;
@@ -1436,7 +1434,6 @@
break;
case LAGG_PROTO_ROUNDROBIN:
case LAGG_PROTO_LOADBALANCE:
- case LAGG_PROTO_ETHERCHANNEL:
speed = 0;
SLIST_FOREACH(lp, &sc->sc_ports, lp_entries)
speed += lp->lp_ifp->if_baudrate;

File Metadata

Mime Type
text/plain
Expires
Fri, May 8, 2:37 AM (9 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28598664
Default Alt Text
D539.1778207867.diff (2 KB)

Event Timeline