From owner-svn-src-all@FreeBSD.ORG Fri May 22 16:11:01 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2D8731065672; Fri, 22 May 2009 16:11:01 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F301A8FC17; Fri, 22 May 2009 16:11:00 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4MGB0fC011624; Fri, 22 May 2009 16:11:00 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4MGB0oI011620; Fri, 22 May 2009 16:11:00 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <200905221611.n4MGB0oI011620@svn.freebsd.org> From: Antoine Brodin Date: Fri, 22 May 2009 16:11:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192587 - in stable/7: share/man/man4 sys sys/conf sys/contrib/pf sys/dev/ath/ath_hal sys/dev/cxgb X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Fri, 22 May 2009 16:11:01 -0000 Author: antoine Date: Fri May 22 16:11:00 2009 New Revision: 192587 URL: http://svn.freebsd.org/changeset/base/192587 Log: MFC r191318 to stable/7: vlan(4) no longer depends on miibus(4). Reviewed by: jhb@ MFC after: 1 month Modified: stable/7/share/man/man4/ (props changed) stable/7/share/man/man4/igb.4 (props changed) stable/7/share/man/man4/vlan.4 stable/7/sys/ (props changed) stable/7/sys/conf/NOTES stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) Modified: stable/7/share/man/man4/vlan.4 ============================================================================== --- stable/7/share/man/man4/vlan.4 Fri May 22 15:56:43 2009 (r192586) +++ stable/7/share/man/man4/vlan.4 Fri May 22 16:11:00 2009 (r192587) @@ -36,7 +36,6 @@ To compile this driver into the kernel, place the following lines in your kernel configuration file: .Bd -ragged -offset indent -.Cd "device miibus" .Cd "device vlan" .Ed .Pp @@ -193,18 +192,7 @@ The MTU setting on .Nm can be corrected manually if used in conjunction with such a parent interface. .Sh SEE ALSO -.Xr kqueue 2 , -.Xr miibus 4 , .Xr ifconfig 8 , .Xr sysctl 8 .Sh BUGS No 802.1Q features except VLAN tagging are implemented. -.Pp -.Dv EVFILT_NETDEV -events on a -.Nm -interface will be sent through -.Xr kqueue 2 -only if the parent interface uses -.Xr miibus 4 -for link state notification. Modified: stable/7/sys/conf/NOTES ============================================================================== --- stable/7/sys/conf/NOTES Fri May 22 15:56:43 2009 (r192586) +++ stable/7/sys/conf/NOTES Fri May 22 16:11:00 2009 (r192587) @@ -710,7 +710,7 @@ device mn # Munich32x/Falc54 Nx64kbit/s # Ethernets; it is MANDATORY when an Ethernet device driver is # configured or token-ring is enabled. # The `vlan' device implements the VLAN tagging of Ethernet frames -# according to IEEE 802.1Q. It requires `device miibus'. +# according to IEEE 802.1Q. # The `wlan' device provides generic code to support 802.11 # drivers, including host AP mode; it is MANDATORY for the wi, # ath, and awi drivers and will eventually be required by all 802.11 drivers.