From: Markus Pfeiffer <markus.pfeiffer@morphism.de>
Date: Tue, 30 Sep 2014 09:17:14 +0000 (+0000)
Subject: net: some LINTing after if_lagg import
X-Git-Tag: v4.1.0~96
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/5362713f54ef09f127ed6c981add2fc4671503b4

net: some LINTing after if_lagg import

* remove duplicate from include/Makefile
* sort mtree alphabetically
* update ifmedia(4) manpage to reflect updates to if_media.h

Reported-By: Sascha Wildner <swildner@online.de>
---

diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 8fc352add6..46778ce197 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -190,6 +190,8 @@
         ..
         ip6fw
         ..
+        lagg
+        ..
         pf
         ..
         ppp
@@ -210,8 +212,6 @@
         ..
         tun
         ..
-        lagg
-        ..
     ..
     netbt
     ..
diff --git a/include/Makefile b/include/Makefile
index 1414821b21..7f067c0a9d 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -70,7 +70,7 @@ LSUBDIRS= \
 	net/bridge net/tap net/tun net/ppp net/ppp_layer net/sl \
 	net/pf net/altq \
 	net/vlan net/ipfw net/ip6fw net/dummynet net/sppp net/ip_mroute \
-	net/altq net/lagg \
+	net/lagg \
 	netgraph/UI netgraph/async netgraph/bpf netgraph/bridge \
 	netgraph/cisco netgraph/echo netgraph/eiface netgraph/etf \
 	netgraph/ether netgraph/fec netgraph/frame_relay netgraph/hole \
diff --git a/share/man/man4/ifmedia.4 b/share/man/man4/ifmedia.4
index aa9662942d..9c73f1fe54 100644
--- a/share/man/man4/ifmedia.4
+++ b/share/man/man4/ifmedia.4
@@ -36,7 +36,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd June 30, 2012
+.Dd September 30, 2014
 .Dt IFMEDIA 4
 .Os
 .Sh NAME
@@ -190,6 +190,15 @@ connector.
 .It Dv IFM_10G_T
 10GBASE-T, 10Gb/s over unshielded twisted pair, RJ45 connector.
 [10Gbase-T]
+.It Dv IFM_40G_CR4
+40GBASE-CR4, 40Gb/s over twin-ax copper cable.
+[40GBASE-CR4]
+.It Dv IFM_40G_SR4
+40GBASE-SR4, 40Gb/s over multi-mode fiber optic cables.
+[40GBASE-SR4]
+.It Dv IFM_40G_LR4
+40GBASE-LR4, 40Gb/s over single-mode fiber optic cables.
+[40GBASE-LR4]
 .El
 .Pp
 The following media options defined for Ethernet:
diff --git a/share/man/man4/lagg.4 b/share/man/man4/lagg.4
index cd37f1edb1..f4bb35f6ab 100644
--- a/share/man/man4/lagg.4
+++ b/share/man/man4/lagg.4
@@ -175,9 +175,10 @@ device will be used:
 (Note the mac address of the wireless device is forced to match the wired
 device as a workaround.)
 .Sh SEE ALSO
+.Xr ifmedia 4 ,
 .Xr ng_one2many 4 ,
-.Xr sysctl 8 ,
-.Xr ifconfig 8
+.Xr ifconfig 8 ,
+.Xr sysctl 8
 .Sh HISTORY
 The
 .Nm