From owner-svn-src-all@FreeBSD.ORG Thu Sep 18 02:22:03 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1543232C; Thu, 18 Sep 2014 02:22:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DAC60A7F; Thu, 18 Sep 2014 02:22:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8I2M282025412; Thu, 18 Sep 2014 02:22:02 GMT (envelope-from araujo@FreeBSD.org) Received: (from araujo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8I2M25P025407; Thu, 18 Sep 2014 02:22:02 GMT (envelope-from araujo@FreeBSD.org) Message-Id: <201409180222.s8I2M25P025407@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: araujo set sender to araujo@FreeBSD.org using -f From: Marcelo Araujo Date: Thu, 18 Sep 2014 02:22:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r271733 - in head: sbin/ifconfig share/man/man4 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Sep 2014 02:22:03 -0000 Author: araujo (ports committer) Date: Thu Sep 18 02:22:02 2014 New Revision: 271733 URL: http://svnweb.freebsd.org/changeset/base/271733 Log: The lagg(4) interface is based on trunk(4) interface from OpenBSD. The FreeBSD is the only system that has the FEC protocol, that is a simple alias to loadbalance protocol and does not implement the ancient Cisco FEC standard. From now on, we remove the fec protocol from the documentation and keep the FEC code only for compatibility. Phabric: D539 Reviewed by: glebius, thompsa Approved by: glebius Sponsored by: QNAP Systems Inc. Modified: head/sbin/ifconfig/ifconfig.8 head/share/man/man4/lagg.4 Modified: head/sbin/ifconfig/ifconfig.8 ============================================================================== --- head/sbin/ifconfig/ifconfig.8 Thu Sep 18 02:12:48 2014 (r271732) +++ head/sbin/ifconfig/ifconfig.8 Thu Sep 18 02:22:02 2014 (r271733) @@ -2332,7 +2332,7 @@ from the aggregation interface. .It Cm laggproto Ar proto Set the aggregation protocol. The default is failover. -The available options are failover, fec, lacp, loadbalance, roundrobin, broadcast +The available options are failover, lacp, loadbalance, roundrobin, broadcast and none. .It Cm lagghash Ar option Ns Oo , Ns Ar option Oc Set the packet layers to hash for aggregation protocols which load balance. Modified: head/share/man/man4/lagg.4 ============================================================================== --- head/share/man/man4/lagg.4 Thu Sep 18 02:12:48 2014 (r271732) +++ head/share/man/man4/lagg.4 Thu Sep 18 02:22:02 2014 (r271733) @@ -61,7 +61,6 @@ option. The driver currently supports the aggregation protocols .Ic failover (the default), -.Ic fec , .Ic lacp , .Ic loadbalance , .Ic roundrobin , @@ -87,9 +86,6 @@ This constraint can be relaxed by settin .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