From owner-svn-src-stable@FreeBSD.ORG  Sat Jan  4 19:04:56 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 43087DA0;
 Sat,  4 Jan 2014 19:04:56 +0000 (UTC)
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 1347518D8;
 Sat,  4 Jan 2014 19:04:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04J4tZ3055443;
 Sat, 4 Jan 2014 19:04:55 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04J4t2h055439;
 Sat, 4 Jan 2014 19:04:55 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201401041904.s04J4t2h055439@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 4 Jan 2014 19:04:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r260278 - in stable: 10/sys/netgraph/netflow
 7/sys/netgraph/netflow 8/sys/netgraph/netflow 9/sys/netgraph/netflow
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Jan 2014 19:04:56 -0000

Author: dim
Date: Sat Jan  4 19:04:53 2014
New Revision: 260278
URL: http://svnweb.freebsd.org/changeset/base/260278

Log:
  MFC r260048:
  
  In sys/netgraph/netflow, use __FBSDID() instead of old-style rcs_id[].

Modified:
  stable/10/sys/netgraph/netflow/netflow.c
  stable/10/sys/netgraph/netflow/netflow_v9.c
  stable/10/sys/netgraph/netflow/ng_netflow.c
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/7/sys/netgraph/netflow/netflow.c
  stable/7/sys/netgraph/netflow/ng_netflow.c
  stable/8/sys/netgraph/netflow/netflow.c
  stable/8/sys/netgraph/netflow/netflow_v9.c
  stable/8/sys/netgraph/netflow/ng_netflow.c
  stable/9/sys/netgraph/netflow/netflow.c
  stable/9/sys/netgraph/netflow/netflow_v9.c
  stable/9/sys/netgraph/netflow/ng_netflow.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/8/sys/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/10/sys/netgraph/netflow/netflow.c
==============================================================================
--- stable/10/sys/netgraph/netflow/netflow.c	Sat Jan  4 18:58:18 2014	(r260277)
+++ stable/10/sys/netgraph/netflow/netflow.c	Sat Jan  4 19:04:53 2014	(r260278)
@@ -28,8 +28,8 @@
  * $SourceForge: netflow.c,v 1.41 2004/09/05 11:41:10 glebius Exp $
  */
 
-static const char rcs_id[] =
-    "@(#) $FreeBSD$";
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "opt_inet6.h"
 #include "opt_route.h"

Modified: stable/10/sys/netgraph/netflow/netflow_v9.c
==============================================================================
--- stable/10/sys/netgraph/netflow/netflow_v9.c	Sat Jan  4 18:58:18 2014	(r260277)
+++ stable/10/sys/netgraph/netflow/netflow_v9.c	Sat Jan  4 19:04:53 2014	(r260278)
@@ -26,8 +26,8 @@
  * 	$FreeBSD$
  */
 
-static const char rcs_id[] =
-    "@(#) $FreeBSD$";
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "opt_inet6.h"
 #include "opt_route.h"

Modified: stable/10/sys/netgraph/netflow/ng_netflow.c
==============================================================================
--- stable/10/sys/netgraph/netflow/ng_netflow.c	Sat Jan  4 18:58:18 2014	(r260277)
+++ stable/10/sys/netgraph/netflow/ng_netflow.c	Sat Jan  4 19:04:53 2014	(r260278)
@@ -28,8 +28,8 @@
  * $SourceForge: ng_netflow.c,v 1.30 2004/09/05 11:37:43 glebius Exp $
  */
 
-static const char rcs_id[] =
-    "@(#) $FreeBSD$";
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "opt_inet6.h"
 #include "opt_route.h"