From 226bc85b61a97981c59378141a712a6edb28cf0f Mon Sep 17 00:00:00 2001
From: ad <ad@NetBSD.org>
Date: Thu, 20 Nov 2008 09:58:45 +0000
Subject: [PATCH] Rename the accept filter modules to make module name match
 filter name.

---
 distrib/sets/lists/base/lkm.mi                     | 10 +++++-----
 sys/modules/Makefile                               |  6 +++---
 sys/modules/{accf_data => accf_dataready}/Makefile |  4 ++--
 sys/modules/{accf_http => accf_httpready}/Makefile |  4 ++--
 sys/netinet/accf_data.c                            |  6 +++---
 sys/netinet/accf_http.c                            |  6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)
 rename sys/modules/{accf_data => accf_dataready}/Makefile (55%)
 rename sys/modules/{accf_http => accf_httpready}/Makefile (55%)

diff --git a/distrib/sets/lists/base/lkm.mi b/distrib/sets/lists/base/lkm.mi
index 2564d3676381..544c73fc05b4 100644
--- a/distrib/sets/lists/base/lkm.mi
+++ b/distrib/sets/lists/base/lkm.mi
@@ -1,14 +1,14 @@
-# $NetBSD: lkm.mi,v 1.34 2008/11/19 18:35:57 ad Exp $
+# $NetBSD: lkm.mi,v 1.35 2008/11/20 09:58:45 ad Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
 ./stand/@MACHINE@				base-kernel-modules
 ./stand/@MACHINE@/@OSRELEASE@			base-kernel-modules
 ./@MODULEDIR@					base-kernel-modules
-./@MODULEDIR@/accf_data				base-kernel-modules
-./@MODULEDIR@/accf_data/accf_data.kmod		base-kernel-modules
-./@MODULEDIR@/accf_http				base-kernel-modules
-./@MODULEDIR@/accf_http/accf_http.kmod		base-kernel-modules
+./@MODULEDIR@/accf_dataready			base-kernel-modules
+./@MODULEDIR@/accf_dataready/accf_dataready.kmod	base-kernel-modules
+./@MODULEDIR@/accf_httpready			base-kernel-modules
+./@MODULEDIR@/accf_httpready/accf_httpready.kmod	base-kernel-modules
 ./@MODULEDIR@/adosfs				base-kernel-modules
 ./@MODULEDIR@/adosfs/adosfs.kmod		base-kernel-modules
 ./@MODULEDIR@/aio				base-kernel-modules
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index f43f0fcd52de..b65dbb87ca67 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.15 2008/11/19 18:36:07 ad Exp $
+#	$NetBSD: Makefile,v 1.16 2008/11/20 09:58:45 ad Exp $
 
 # For all platforms
 
-SUBDIR=		accf_data
-SUBDIR+=	accf_http
+SUBDIR=		accf_dataready
+SUBDIR+=	accf_httpready
 SUBDIR+=	adosfs
 SUBDIR+=	aio
 SUBDIR+=	cd9660
diff --git a/sys/modules/accf_data/Makefile b/sys/modules/accf_dataready/Makefile
similarity index 55%
rename from sys/modules/accf_data/Makefile
rename to sys/modules/accf_dataready/Makefile
index 0fc4811658e7..f6fecda3e32b 100644
--- a/sys/modules/accf_data/Makefile
+++ b/sys/modules/accf_dataready/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.1 2008/11/12 12:36:28 ad Exp $
+#	$NetBSD: Makefile,v 1.1 2008/11/20 09:58:45 ad Exp $
 
 .include "../Makefile.inc"
 
 .PATH:	${S}/netinet
 
-KMOD=	accf_data
+KMOD=	accf_dataready
 SRCS=	accf_data.c
 
 .include <bsd.kmodule.mk>
diff --git a/sys/modules/accf_http/Makefile b/sys/modules/accf_httpready/Makefile
similarity index 55%
rename from sys/modules/accf_http/Makefile
rename to sys/modules/accf_httpready/Makefile
index 5e0909e38c45..311a01f9aa52 100644
--- a/sys/modules/accf_http/Makefile
+++ b/sys/modules/accf_httpready/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.1 2008/11/12 12:36:28 ad Exp $
+#	$NetBSD: Makefile,v 1.1 2008/11/20 09:58:45 ad Exp $
 
 .include "../Makefile.inc"
 
 .PATH:	${S}/netinet
 
-KMOD=	accf_http
+KMOD=	accf_httpready
 SRCS=	accf_http.c
 
 .include <bsd.kmodule.mk>
diff --git a/sys/netinet/accf_data.c b/sys/netinet/accf_data.c
index aebad5bcabb8..f2d029e2b89a 100644
--- a/sys/netinet/accf_data.c
+++ b/sys/netinet/accf_data.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: accf_data.c,v 1.3 2008/11/12 12:36:28 ad Exp $	*/
+/*	$NetBSD: accf_data.c,v 1.4 2008/11/20 09:58:45 ad Exp $	*/
 
 /*-
  * Copyright (c) 2000 Alfred Perlstein <alfred@FreeBSD.org>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: accf_data.c,v 1.3 2008/11/12 12:36:28 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: accf_data.c,v 1.4 2008/11/20 09:58:45 ad Exp $");
 
 #define ACCEPT_FILTER_MOD
 
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: accf_data.c,v 1.3 2008/11/12 12:36:28 ad Exp $");
 
 #include <netinet/accept_filter.h>
 
-MODULE(MODULE_CLASS_MISC, accf_data, NULL);
+MODULE(MODULE_CLASS_MISC, accf_dataready, NULL);
 
 /* accept filter that holds a socket until data arrives */
 
diff --git a/sys/netinet/accf_http.c b/sys/netinet/accf_http.c
index 86efbbb9f790..bea479a28a11 100644
--- a/sys/netinet/accf_http.c
+++ b/sys/netinet/accf_http.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: accf_http.c,v 1.3 2008/11/12 12:36:28 ad Exp $	*/
+/*	$NetBSD: accf_http.c,v 1.4 2008/11/20 09:58:45 ad Exp $	*/
 
 /*-
  * Copyright (c) 2000 Paycounter, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: accf_http.c,v 1.3 2008/11/12 12:36:28 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: accf_http.c,v 1.4 2008/11/20 09:58:45 ad Exp $");
 
 #define ACCEPT_FILTER_MOD
 
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: accf_http.c,v 1.3 2008/11/12 12:36:28 ad Exp $");
 
 #include <netinet/accept_filter.h>
 
-MODULE(MODULE_CLASS_MISC, accf_http, NULL);
+MODULE(MODULE_CLASS_MISC, accf_httpready, NULL);
 
 /* check for GET/HEAD */
 static void sohashttpget(struct socket *so, void *arg, int waitflag);