From owner-p4-projects@FreeBSD.ORG  Wed Feb 20 19:47:11 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4828B16A404; Wed, 20 Feb 2008 19:47:11 +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 0B39D16A400
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 19:47:11 +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 E7C4713C459
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 19:47:10 +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 m1KJlAsr087297
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 19:47:10 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1KJlAmd087294
	for perforce@freebsd.org; Wed, 20 Feb 2008 19:47:10 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 20 Feb 2008 19:47:10 GMT
Message-Id: <200802201947.m1KJlAmd087294@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 135834 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Feb 2008 19:47:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=135834

Change 135834 by sam@sam_ebb on 2008/02/20 19:46:32

	IFC finally

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_power.h#5 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#8 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_regdomain.h#4 integrate

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_power.h#5 (text+ko) ====


==== //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#8 (text+ko) ====

@@ -30,9 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-#ifdef __FreeBSD__
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.19 2005/01/27 17:39:17 sam Exp $");
-#endif
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_regdomain.c,v 1.3 2007/09/17 03:48:32 sam Exp $");
 
 /*
  * IEEE 802.11 regdomain support.
@@ -276,7 +274,7 @@
 		}
 	}
 	ie->len = frm - ie->cc;
-	if (ie->len & 1) {		/* pad to multiple of 2 */
+	if (ie->len & 1) {		/* Zero pad to multiple of 2 */
 		ie->len++;
 		*frm++ = 0;
 	}

==== //depot/projects/vap/sys/net80211/ieee80211_regdomain.h#4 (text+ko) ====