From owner-p4-projects@FreeBSD.ORG Fri Jun 29 04:32:34 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 E2FF016A469; Fri, 29 Jun 2007 04:32:33 +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 8C29E16A421 for ; Fri, 29 Jun 2007 04:32:33 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7A14113C480 for ; Fri, 29 Jun 2007 04:32:33 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5T4WXT5043248 for ; Fri, 29 Jun 2007 04:32:33 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5T4WWG4043243 for perforce@freebsd.org; Fri, 29 Jun 2007 04:32:32 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 29 Jun 2007 04:32:32 GMT Message-Id: <200706290432.l5T4WWG4043243@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 122514 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: Fri, 29 Jun 2007 04:32:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=122514 Change 122514 by thompsa@thompsa_heff on 2007/06/29 04:32:25 Sync all the files to HEAD, this is pretty much copyright headers and $Id$ tags. Makes merging much easier. Affected files ... .. //depot/projects/wifi/sys/net80211/_ieee80211.h#23 edit .. //depot/projects/wifi/sys/net80211/ieee80211.c#55 edit .. //depot/projects/wifi/sys/net80211/ieee80211.h#24 edit .. //depot/projects/wifi/sys/net80211/ieee80211_acl.c#10 edit .. //depot/projects/wifi/sys/net80211/ieee80211_amrr.c#5 edit .. //depot/projects/wifi/sys/net80211/ieee80211_amrr.h#2 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#25 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.h#18 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_ccmp.c#15 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_none.c#12 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#18 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_wep.c#15 edit .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#28 edit .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#31 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ht.c#4 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ht.h#3 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#82 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#43 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#96 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#48 edit .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#77 edit .. //depot/projects/wifi/sys/net80211/ieee80211_power.c#8 edit .. //depot/projects/wifi/sys/net80211/ieee80211_power.h#2 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#60 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#39 edit .. //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#14 edit .. //depot/projects/wifi/sys/net80211/ieee80211_regdomain.c#5 edit .. //depot/projects/wifi/sys/net80211/ieee80211_regdomain.h#4 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan.c#15 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan.h#10 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan_ap.c#8 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#21 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#60 edit .. //depot/projects/wifi/sys/net80211/ieee80211_xauth.c#5 edit Differences ... ==== //depot/projects/wifi/sys/net80211/_ieee80211.h#23 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211.c#55 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211.h#24 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_acl.c#10 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_amrr.c#5 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_amrr.h#2 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#25 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.h#18 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_ccmp.c#15 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_none.c#12 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#18 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_wep.c#15 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#28 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#31 (text+ko) ==== @@ -22,7 +22,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_freebsd.h,v 1.13 2007/06/11 03:36:54 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_freebsd.h,v 1.14 2007/06/25 03:26:10 sam Exp $ */ #ifndef _NET80211_IEEE80211_FREEBSD_H_ #define _NET80211_IEEE80211_FREEBSD_H_ @@ -177,7 +177,7 @@ struct ifqueue; void ieee80211_drain_ifq(struct ifqueue *); -#define msecs_to_ticks(ms) ((ms)*1000/hz) +#define msecs_to_ticks(ms) (((ms)*hz)/1000) #define time_after(a,b) ((long)(b) - (long)(a) < 0) #define time_before(a,b) time_after(b,a) #define time_after_eq(a,b) ((long)(a) - (long)(b) >= 0) ==== //depot/projects/wifi/sys/net80211/ieee80211_ht.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ #include #ifdef __FreeBSD__ -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ht.c,v 1.1 2007/06/11 03:36:54 sam Exp $"); #endif /* ==== //depot/projects/wifi/sys/net80211/ieee80211_ht.h#3 (text+ko) ==== @@ -22,7 +22,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$ + * $FreeBSD: src/sys/net80211/ieee80211_ht.h,v 1.1 2007/06/11 03:36:54 sam Exp $ */ #ifndef _NET80211_IEEE80211_HT_H_ #define _NET80211_IEEE80211_HT_H_ ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#82 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#43 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#96 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#48 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#77 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_power.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,12 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -30,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_power.c,v 1.1 2007/06/11 03:36:54 sam Exp $"); /* * IEEE 802.11 power save support. ==== //depot/projects/wifi/sys/net80211/ieee80211_power.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,12 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -28,7 +22,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.15 2005/04/04 04:27:20 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_power.h,v 1.1 2007/06/11 03:36:54 sam Exp $ */ #ifndef _NET80211_IEEE80211_POWER_H_ #define _NET80211_IEEE80211_POWER_H_ ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#60 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.h#39 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#14 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_regdomain.c#5 (text+ko) ==== @@ -10,12 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -30,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.19 2005/01/27 17:39:17 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_regdomain.c,v 1.1 2007/06/11 03:36:55 sam Exp $"); /* * IEEE 802.11 regdomain support. ==== //depot/projects/wifi/sys/net80211/ieee80211_regdomain.h#4 (text+ko) ==== @@ -10,12 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -28,7 +22,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.h,v 1.8 2004/12/31 22:44:26 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_regdomain.h,v 1.1 2007/06/11 03:36:55 sam Exp $ */ #ifndef _NET80211_IEEE80211_REGDOMAIN_H_ #define _NET80211_IEEE80211_REGDOMAIN_H_ ==== //depot/projects/wifi/sys/net80211/ieee80211_scan.c#15 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,12 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -30,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan.c,v 1.1 2007/06/11 03:36:55 sam Exp $"); /* * IEEE 802.11 scanning support. ==== //depot/projects/wifi/sys/net80211/ieee80211_scan.h#10 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 Sam Leffler, Errno Consulting + * Copyright (c) 2005-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,12 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -28,7 +22,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.18 2004/12/31 22:42:38 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_scan.h,v 1.1 2007/06/11 03:36:55 sam Exp $ */ #ifndef _NET80211_IEEE80211_SCAN_H_ #define _NET80211_IEEE80211_SCAN_H_ ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_ap.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,12 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -30,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan_ap.c,v 1.1 2007/06/11 03:36:55 sam Exp $"); /* * IEEE 802.11 ap scanning support. ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#21 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,12 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -30,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan_sta.c,v 1.1 2007/06/11 03:36:55 sam Exp $"); /* * IEEE 802.11 station scanning support. ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#60 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_xauth.c#5 (text+ko) ====