From owner-svn-src-all@FreeBSD.ORG  Wed Oct 30 18:33:41 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 0A06B557;
 Wed, 30 Oct 2013 18:33:41 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id EB0962984;
 Wed, 30 Oct 2013 18:33:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9UIXedq094994;
 Wed, 30 Oct 2013 18:33:40 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9UIXe5M094992;
 Wed, 30 Oct 2013 18:33:40 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201310301833.r9UIXe5M094992@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 30 Oct 2013 18:33:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257394 - head/contrib/wpa/src/utils
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Oct 2013 18:33:41 -0000

Author: emaste
Date: Wed Oct 30 18:33:40 2013
New Revision: 257394
URL: http://svnweb.freebsd.org/changeset/base/257394

Log:
  Revert to upstream literal $FreeBSD tag
  
  radiotap.h in upstream wpa originally came from the FreeBSD CVS
  repository.  The copy in vendor/ matched the upstream one; with this
  change the contrib copy now matches too.
  
  Discussed with:	jhb@

Modified:
  head/contrib/wpa/src/utils/radiotap.h

Modified: head/contrib/wpa/src/utils/radiotap.h
==============================================================================
--- head/contrib/wpa/src/utils/radiotap.h	Wed Oct 30 18:26:18 2013	(r257393)
+++ head/contrib/wpa/src/utils/radiotap.h	Wed Oct 30 18:33:40 2013	(r257394)
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/contrib/wpa/src/utils/radiotap.h 214734 2010-11-03 10:43:38Z rpaulo $ */
+/* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.5 2005/01/22 20:12:05 sam Exp $ */
 /* $NetBSD: ieee80211_radiotap.h,v 1.11 2005/06/22 06:16:02 dyoung Exp $ */
 
 /*-