From owner-p4-projects@FreeBSD.ORG Mon May 12 01:44:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84AEB1065676; Mon, 12 May 2008 01:44:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 45FC7106566C for ; Mon, 12 May 2008 01:44:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3298E8FC14 for ; Mon, 12 May 2008 01:44:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4C1i4CM044251 for ; Mon, 12 May 2008 01:44:04 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4C1i34R044249 for perforce@freebsd.org; Mon, 12 May 2008 01:44:03 GMT (envelope-from sam@freebsd.org) Date: Mon, 12 May 2008 01:44:03 GMT Message-Id: <200805120144.m4C1i34R044249@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 141494 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: Mon, 12 May 2008 01:44:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=141494 Change 141494 by sam@sam_ebb on 2008/05/12 01:43:45 IFC @ 141493 Affected files ... .. //depot/projects/vap/contrib/expat/lib/expat_external.h#2 integrate .. //depot/projects/vap/contrib/expat/tests/benchmark/README.txt#2 integrate .. //depot/projects/vap/contrib/expat/tests/benchmark/benchmark.c#2 integrate .. //depot/projects/vap/contrib/expat/tests/benchmark/benchmark.dsp#2 integrate .. //depot/projects/vap/contrib/expat/tests/benchmark/benchmark.dsw#2 integrate .. //depot/projects/vap/contrib/expat/tests/minicheck.c#2 integrate .. //depot/projects/vap/contrib/expat/tests/minicheck.h#2 integrate .. //depot/projects/vap/contrib/expat/tests/runtestspp.cpp#2 integrate .. //depot/projects/vap/sys/dev/ath/if_ath.c#73 integrate .. //depot/projects/vap/sys/dev/coretemp/coretemp.c#5 integrate .. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#26 integrate .. //depot/projects/vap/sys/dev/ipw/if_ipw.c#21 integrate .. //depot/projects/vap/sys/dev/iwi/if_iwi.c#32 integrate .. //depot/projects/vap/sys/dev/iwn/if_iwn.c#20 integrate .. //depot/projects/vap/sys/dev/k8temp/k8temp.c#4 integrate .. //depot/projects/vap/sys/dev/malo/if_malo.c#10 integrate .. //depot/projects/vap/sys/dev/ral/rt2560.c#38 integrate .. //depot/projects/vap/sys/dev/ral/rt2661.c#36 integrate .. //depot/projects/vap/sys/dev/usb/if_rum.c#24 integrate .. //depot/projects/vap/sys/dev/usb/if_ural.c#22 integrate .. //depot/projects/vap/sys/dev/usb/if_zyd.c#23 integrate .. //depot/projects/vap/sys/dev/wi/if_wi.c#34 integrate .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#25 integrate .. //depot/projects/vap/sys/net80211/ieee80211.c#46 integrate .. //depot/projects/vap/sys/net80211/ieee80211.h#11 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#16 integrate .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#30 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#23 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ht.h#14 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#58 integrate .. //depot/projects/vap/sys/net80211/ieee80211_phy.c#8 integrate .. //depot/projects/vap/sys/net80211/ieee80211_phy.h#7 integrate .. //depot/projects/vap/sys/net80211/ieee80211_proto.h#22 integrate .. //depot/projects/vap/sys/net80211/ieee80211_var.h#43 integrate Differences ... ==== //depot/projects/vap/contrib/expat/lib/expat_external.h#2 (text+ko) ==== ==== //depot/projects/vap/contrib/expat/tests/benchmark/README.txt#2 (text+ko) ==== ==== //depot/projects/vap/contrib/expat/tests/benchmark/benchmark.c#2 (text+ko) ==== ==== //depot/projects/vap/contrib/expat/tests/benchmark/benchmark.dsp#2 (text+ko) ==== ==== //depot/projects/vap/contrib/expat/tests/benchmark/benchmark.dsw#2 (text+ko) ==== ==== //depot/projects/vap/contrib/expat/tests/minicheck.c#2 (text+ko) ==== ==== //depot/projects/vap/contrib/expat/tests/minicheck.h#2 (text+ko) ==== ==== //depot/projects/vap/contrib/expat/tests/runtestspp.cpp#2 (text+ko) ==== ==== //depot/projects/vap/sys/dev/ath/if_ath.c#73 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.185 2008/05/03 21:55:02 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.186 2008/05/12 00:15:27 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. ==== //depot/projects/vap/sys/dev/coretemp/coretemp.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2007 Rui Paulo + * Copyright (c) 2007, 2008 Rui Paulo * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.6 2008/02/14 14:14:59 rpaulo Exp $ + * $FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.7 2008/05/11 23:17:57 rpaulo Exp $ * */ @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.6 2008/02/14 14:14:59 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.7 2008/05/11 23:17:57 rpaulo Exp $"); #include #include @@ -96,8 +96,8 @@ if (device_find_child(parent, "coretemp", -1) != NULL) return; - /* Check that CPUID is supported and the vendor is Intel.*/ - if (cpu_high == 0 || strcmp(cpu_vendor, "GenuineIntel")) + /* Check that CPUID 0x06 is supported and the vendor is Intel.*/ + if (cpu_high < 6 || strcmp(cpu_vendor, "GenuineIntel")) return; /* * CPUID 0x06 returns 1 if the processor has on-die thermal ==== //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#26 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.138 2008/05/10 20:12:43 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.139 2008/05/12 00:15:28 sam Exp $"); #include #include ==== //depot/projects/vap/sys/dev/ipw/if_ipw.c#21 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.37 2008/05/10 20:25:58 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.38 2008/05/12 00:15:28 sam Exp $ */ /*- * Copyright (c) 2004-2006 @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.37 2008/05/10 20:25:58 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.38 2008/05/12 00:15:28 sam Exp $"); /*- * Intel(R) PRO/Wireless 2100 MiniPCI driver ==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#32 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.61 2008/05/01 04:54:59 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.62 2008/05/12 00:15:28 sam Exp $"); /*- * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver ==== //depot/projects/vap/sys/dev/iwn/if_iwn.c#20 (text+kox) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iwn/if_iwn.c,v 1.4 2008/05/01 04:54:59 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iwn/if_iwn.c,v 1.5 2008/05/12 00:15:29 sam Exp $"); #include #include ==== //depot/projects/vap/sys/dev/k8temp/k8temp.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/k8temp/k8temp.c,v 1.2 2008/04/21 22:00:01 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/k8temp/k8temp.c,v 1.3 2008/05/11 23:14:07 rpaulo Exp $"); #include #include @@ -265,12 +265,12 @@ case CORE0: auxtemp[0] = k8temp_gettemp(dev, SENSOR0_CORE0); auxtemp[1] = k8temp_gettemp(dev, SENSOR1_CORE0); - temp = max(auxtemp[0], auxtemp[1]); + temp = MAX(auxtemp[0], auxtemp[1]); break; case CORE1: auxtemp[0] = k8temp_gettemp(dev, SENSOR0_CORE1); auxtemp[1] = k8temp_gettemp(dev, SENSOR1_CORE1); - temp = max(auxtemp[0], auxtemp[1]); + temp = MAX(auxtemp[0], auxtemp[1]); break; default: temp = k8temp_gettemp(dev, arg2); ==== //depot/projects/vap/sys/dev/malo/if_malo.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ #include #ifdef __FreeBSD__ -__FBSDID("$FreeBSD: src/sys/dev/malo/if_malo.c,v 1.3 2008/04/20 23:10:44 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/malo/if_malo.c,v 1.4 2008/05/12 00:15:29 sam Exp $"); #endif #include "opt_malo.h" ==== //depot/projects/vap/sys/dev/ral/rt2560.c#38 (text) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ral/rt2560.c,v 1.22 2008/05/10 20:25:58 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/ral/rt2560.c,v 1.25 2008/05/12 00:32:52 sam Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ral/rt2560.c,v 1.22 2008/05/10 20:25:58 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ral/rt2560.c,v 1.25 2008/05/12 00:32:52 sam Exp $"); /*- * Ralink Technology RT2560 chipset driver @@ -278,7 +278,7 @@ /* set device capabilities */ ic->ic_caps = - IEEE80211_C_STA /* station mode supported */ + IEEE80211_C_STA /* station mode */ | IEEE80211_C_IBSS /* ibss, nee adhoc, mode */ | IEEE80211_C_HOSTAP /* hostap mode */ | IEEE80211_C_MONITOR /* monitor mode */ @@ -1679,7 +1679,7 @@ ackrate = ieee80211_ack_rate(sc->sc_rates, rate); isshort = (ic->ic_flags & IEEE80211_F_SHPREAMBLE) != 0; - dur = ieee80211_compute_duration(sc->sc_rates, pktlen, rate, isshort); + dur = ieee80211_compute_duration(sc->sc_rates, pktlen, rate, isshort) + ieee80211_ack_duration(sc->sc_rates, rate, isshort); flags = RT2560_TX_MORE_FRAG; if (prot == IEEE80211_PROT_RTSCTS) { ==== //depot/projects/vap/sys/dev/ral/rt2661.c#36 (text) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ral/rt2661.c,v 1.22 2008/05/10 20:25:58 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/ral/rt2661.c,v 1.25 2008/05/12 00:32:52 sam Exp $ */ /*- * Copyright (c) 2006 @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ral/rt2661.c,v 1.22 2008/05/10 20:25:58 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ral/rt2661.c,v 1.25 2008/05/12 00:32:52 sam Exp $"); /*- * Ralink Technology RT2561, RT2561S and RT2661 chipset driver @@ -280,7 +280,7 @@ /* set device capabilities */ ic->ic_caps = - IEEE80211_C_STA /* station mode supported */ + IEEE80211_C_STA /* station mode */ | IEEE80211_C_IBSS /* ibss, nee adhoc, mode */ | IEEE80211_C_HOSTAP /* hostap mode */ | IEEE80211_C_MONITOR /* monitor mode */ @@ -1445,7 +1445,7 @@ ackrate = ieee80211_ack_rate(sc->sc_rates, rate); isshort = (ic->ic_flags & IEEE80211_F_SHPREAMBLE) != 0; - dur = ieee80211_compute_duration(sc->sc_rates, pktlen, rate, isshort); + dur = ieee80211_compute_duration(sc->sc_rates, pktlen, rate, isshort) + ieee80211_ack_duration(sc->sc_rates, rate, isshort); flags = RT2661_TX_MORE_FRAG; if (prot == IEEE80211_PROT_RTSCTS) { ==== //depot/projects/vap/sys/dev/usb/if_rum.c#24 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/if_rum.c,v 1.20 2008/05/01 04:55:00 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_rum.c,v 1.22 2008/05/12 00:32:52 sam Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.20 2008/05/01 04:55:00 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.22 2008/05/12 00:32:52 sam Exp $"); /*- * Ralink Technology RT2501USB/RT2601USB chipset driver ==== //depot/projects/vap/sys/dev/usb/if_ural.c#22 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.71 2008/04/20 20:35:38 sam Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.73 2008/05/12 00:32:52 sam Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.71 2008/04/20 20:35:38 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.73 2008/05/12 00:32:52 sam Exp $"); /*- * Ralink Technology RT2500USB chipset driver ==== //depot/projects/vap/sys/dev/usb/if_zyd.c#23 (text+ko) ==== @@ -1,6 +1,6 @@ /* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */ /* $NetBSD: if_zyd.c,v 1.7 2007/06/21 04:04:29 kiyohara Exp $ */ -/* $FreeBSD: src/sys/dev/usb/if_zyd.c,v 1.15 2008/05/01 04:55:00 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_zyd.c,v 1.17 2008/05/12 00:32:52 sam Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini @@ -390,7 +390,7 @@ /* set device capabilities */ ic->ic_caps = - IEEE80211_C_STA /* station mode supported */ + IEEE80211_C_STA /* station mode */ | IEEE80211_C_MONITOR /* monitor mode */ | IEEE80211_C_SHPREAMBLE /* short preamble supported */ | IEEE80211_C_SHSLOT /* short slot time supported */ ==== //depot/projects/vap/sys/dev/wi/if_wi.c#34 (text+ko) ==== @@ -60,7 +60,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.217 2008/05/10 20:25:59 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.218 2008/05/12 00:15:30 sam Exp $"); #define WI_HERMES_STATS_WAR /* Work around stats counter bug. */ @@ -332,6 +332,7 @@ ic->ic_phytype = IEEE80211_T_DS; ic->ic_opmode = IEEE80211_M_STA; ic->ic_caps = IEEE80211_C_STA + | IEEE80211_C_PMGT | IEEE80211_C_MONITOR | IEEE80211_C_PMGT ; ==== //depot/projects/vap/sys/dev/wpi/if_wpi.c#25 (text+ko) ==== @@ -19,7 +19,7 @@ #define VERSION "20071127" #include -__FBSDID("$FreeBSD: src/sys/dev/wpi/if_wpi.c,v 1.12 2008/05/01 04:55:00 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wpi/if_wpi.c,v 1.13 2008/05/12 00:15:30 sam Exp $"); /* * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters. ==== //depot/projects/vap/sys/net80211/ieee80211.c#46 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.49 2008/05/01 03:49:59 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.52 2008/05/12 00:15:30 sam Exp $"); /* * IEEE 802.11 generic handler ==== //depot/projects/vap/sys/net80211/ieee80211.h#11 (text+ko) ==== @@ -23,7 +23,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.19 2008/04/20 20:35:43 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211.h,v 1.20 2008/05/11 23:20:26 sam Exp $ */ #ifndef _NET80211_IEEE80211_H_ #define _NET80211_IEEE80211_H_ ==== //depot/projects/vap/sys/net80211/ieee80211_ddb.c#16 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ddb.c,v 1.3 2008/05/12 00:15:30 sam Exp $"); #include "opt_ddb.h" #include "opt_wlan.h" ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#30 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.18 2008/04/20 20:35:43 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.19 2008/05/12 00:15:30 sam Exp $"); /* * IEEE 802.11 support (FreeBSD-specific code) ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#23 (text+ko) ==== @@ -25,7 +25,7 @@ #include #ifdef __FreeBSD__ -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ht.c,v 1.9 2008/04/20 20:35:43 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ht.c,v 1.10 2008/05/11 23:27:57 sam Exp $"); #endif /* ==== //depot/projects/vap/sys/net80211/ieee80211_ht.h#14 (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_ht.h,v 1.5 2008/04/20 20:35:43 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_ht.h,v 1.6 2008/05/11 23:18:11 sam Exp $ */ #ifndef _NET80211_IEEE80211_HT_H_ #define _NET80211_IEEE80211_HT_H_ ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#58 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.59 2008/04/20 20:35:43 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.60 2008/05/11 23:36:58 sam Exp $"); /* * IEEE 802.11 ioctl support (FreeBSD-specific) ==== //depot/projects/vap/sys/net80211/ieee80211_phy.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_phy.c,v 1.2 2008/05/12 00:32:51 sam Exp $"); /* * IEEE 802.11 PHY-related support. ==== //depot/projects/vap/sys/net80211/ieee80211_phy.h#7 (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_phy.h,v 1.2 2008/05/12 00:32:51 sam Exp $ */ #ifndef _NET80211_IEEE80211_PHY_H_ ==== //depot/projects/vap/sys/net80211/ieee80211_proto.h#22 (text+ko) ==== @@ -23,7 +23,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.28 2008/04/20 20:35:44 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_proto.h,v 1.30 2008/05/12 00:34:28 sam Exp $ */ #ifndef _NET80211_IEEE80211_PROTO_H_ #define _NET80211_IEEE80211_PROTO_H_ ==== //depot/projects/vap/sys/net80211/ieee80211_var.h#43 (text+ko) ==== @@ -23,7 +23,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.55 2008/04/20 20:35:44 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_var.h,v 1.57 2008/05/12 00:15:30 sam Exp $ */ #ifndef _NET80211_IEEE80211_VAR_H_ #define _NET80211_IEEE80211_VAR_H_