From owner-p4-projects@FreeBSD.ORG Sun Mar 11 07:47:58 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD21816A411; Sun, 11 Mar 2007 07:47:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 90A9516A407 for ; Sun, 11 Mar 2007 07:47:57 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7D94E13C48D for ; Sun, 11 Mar 2007 07:47:57 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l2B7lvS4089448 for ; Sun, 11 Mar 2007 07:47:57 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l2B7luFS089444 for perforce@freebsd.org; Sun, 11 Mar 2007 07:47:56 GMT (envelope-from sam@freebsd.org) Date: Sun, 11 Mar 2007 07:47:56 GMT Message-Id: <200703110747.l2B7luFS089444@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 115711 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Mar 2007 07:47:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=115711 Change 115711 by sam@sam_ebb on 2007/03/11 07:47:14 loopback Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.c#44 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#20 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.h#14 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#95 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#70 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#89 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#43 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#68 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#50 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#33 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#50 integrate Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.c#44 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.35 2007/01/15 01:12:28 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.36 2007/03/11 06:24:26 sam Exp $"); /* * IEEE 802.11 generic handler ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#20 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto.c,v 1.12 2005/08/08 18:46:35 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto.c,v 1.14 2007/03/11 06:38:26 sam Exp $"); /* * IEEE 802.11 generic crypto support. ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.h#14 (text+ko) ==== @@ -29,7 +29,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/net80211/ieee80211_crypto.h,v 1.10 2005/08/08 18:46:35 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_crypto.h,v 1.11 2007/03/11 06:36:10 sam Exp $ */ #ifndef _NET80211_IEEE80211_CRYPTO_H_ #define _NET80211_IEEE80211_CRYPTO_H_ ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#95 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.100 2007/03/07 04:42:22 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.108 2007/03/11 07:22:21 sam Exp $"); #include #include ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#70 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.52 2007/03/05 19:12:25 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.53 2007/03/11 07:06:07 sam Exp $"); #include "opt_compat.h" ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#89 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.79 2007/03/07 04:31:49 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.81 2007/03/11 07:22:21 sam Exp $"); #include #include ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#43 (text+ko) ==== @@ -29,7 +29,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/net80211/ieee80211_node.h,v 1.24 2006/03/06 17:23:26 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_node.h,v 1.25 2007/03/11 07:06:08 sam Exp $ */ #ifndef _NET80211_IEEE80211_NODE_H_ #define _NET80211_IEEE80211_NODE_H_ ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#68 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.46 2006/12/27 18:46:18 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.48 2007/03/11 07:06:08 sam Exp $"); #include "opt_inet.h" ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#50 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_proto.c,v 1.35 2007/03/07 04:35:07 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_proto.c,v 1.36 2007/03/11 07:22:21 sam Exp $"); /* * IEEE 802.11 protocol support. ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.h#33 (text+ko) ==== @@ -29,7 +29,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/net80211/ieee80211_proto.h,v 1.21 2007/03/07 04:35:07 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_proto.h,v 1.22 2007/03/11 07:22:21 sam Exp $ */ #ifndef _NET80211_IEEE80211_PROTO_H_ #define _NET80211_IEEE80211_PROTO_H_ ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#50 (text+ko) ==== @@ -29,7 +29,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/net80211/ieee80211_var.h,v 1.46 2007/03/05 18:52:35 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_var.h,v 1.47 2007/03/11 07:15:38 sam Exp $ */ #ifndef _NET80211_IEEE80211_VAR_H_ #define _NET80211_IEEE80211_VAR_H_